summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2017-10-23Git 2.14.3v2.14.3Junio C Hamano2-1/+25
2017-10-23Merge branch 'jk/info-alternates-fix' into maintJunio C Hamano1-20/+11
2017-10-23Merge branch 'jc/fetch-refspec-doc-update' into maintJunio C Hamano1-2/+4
2017-10-23Merge branch 'jk/write-in-full-fix' into maintJunio C Hamano22-67/+65
2017-10-23Merge branch 'rj/no-sign-compare' into maintJunio C Hamano10-24/+25
2017-10-23Merge branch 'ma/ts-cleanups' into maintJunio C Hamano6-3/+37
2017-10-23Merge branch 'ls/travis-scriptify' into maintJunio C Hamano10-81/+154
2017-10-23Merge branch 'er/fast-import-dump-refs-on-checkpoint' into maintJunio C Hamano2-3/+145
2017-10-23Merge branch 'jt/fast-export-copy-modify-fix' into maintJunio C Hamano2-15/+51
2017-10-23Merge branch 'nd/worktree-kill-parse-ref' into maintJunio C Hamano3-3/+17
2017-10-18Prepare for 2.14.3Junio C Hamano2-1/+76
2017-10-18Merge branch 'jk/ref-filter-colors-fix' into maintJunio C Hamano23-71/+103
2017-10-18Merge branch 'jc/doc-checkout' into maintJunio C Hamano1-14/+16
2017-10-18Merge branch 'tb/complete-describe' into maintJunio C Hamano1-1/+1
2017-10-18Merge branch 'rs/rs-mailmap' into maintJunio C Hamano1-0/+1
2017-10-18Merge branch 'rs/fsck-null-return-from-lookup' into maintJunio C Hamano2-4/+26
2017-10-18Merge branch 'jk/sha1-loose-object-info-fix' into maintJunio C Hamano1-2/+6
2017-10-18Merge branch 'sb/branch-avoid-repeated-strbuf-release' into maintJunio C Hamano1-2/+3
2017-10-18Merge branch 'rs/qsort-s' into maintJunio C Hamano1-1/+1
2017-10-18Merge branch 'jn/strbuf-doc-re-reuse' into maintJunio C Hamano1-2/+9
2017-10-18Merge branch 'rs/run-command-use-alloc-array' into maintJunio C Hamano1-1/+1
2017-10-18Merge branch 'rs/tag-null-pointer-arith-fix' into maintJunio C Hamano1-4/+4
2017-10-18Merge branch 'rs/cocci-de-paren-call-params' into maintJunio C Hamano1-5/+5
2017-10-18Merge branch 'ad/doc-markup-fix' into maintJunio C Hamano1-1/+1
2017-10-18Merge branch 'mr/doc-negative-pathspec' into maintJunio C Hamano5-2/+24
2017-10-18Merge branch 'jk/validate-headref-fix' into maintJunio C Hamano1-11/+12
2017-10-18Merge branch 'ks/doc-use-camelcase-for-config-name' into maintJunio C Hamano2-3/+3
2017-10-18Merge branch 'jk/doc-read-tree-table-asciidoctor-fix' into maintJunio C Hamano1-0/+2
2017-10-18Merge branch 'hn/typofix' into maintJunio C Hamano1-1/+1
2017-10-18Merge branch 'ks/test-readme-phrasofix' into maintJunio C Hamano1-3/+3
2017-10-18Merge branch 'ez/doc-duplicated-words-fix' into maintJunio C Hamano4-4/+4
2017-10-18Merge branch 'kd/doc-for-each-ref' into maintJunio C Hamano1-16/+17
2017-10-18Merge branch 'cc/subprocess-handshake-missing-capabilities' into maintJunio C Hamano1-2/+2
2017-10-18Merge branch 'jk/system-path-cleanup' into maintJunio C Hamano1-14/+28
2017-10-18Merge branch 'bb/doc-eol-dirty' into maintJunio C Hamano1-1/+4
2017-10-18Merge branch 'mg/timestamp-t-fix' into maintJunio C Hamano1-1/+1
2017-10-18Merge branch 'ma/pkt-line-leakfix' into maintJunio C Hamano1-1/+2
2017-10-18Merge branch 'jk/config-lockfile-leak-fix' into maintJunio C Hamano1-17/+7
2017-10-18Merge branch 'dw/diff-highlight-makefile-fix' into maintJunio C Hamano1-0/+3
2017-10-18Merge branch 'jk/drop-sha1-entry-pos' into maintJunio C Hamano5-244/+1
2017-10-18Merge branch 'tb/ref-filter-empty-modifier' into maintJunio C Hamano2-1/+10
2017-10-18Merge branch 'rb/compat-poll-fix' into maintJunio C Hamano1-0/+4
2017-10-18Merge branch 'tg/memfixes' into maintJunio C Hamano3-8/+6
2017-10-18Merge branch 'ar/request-pull-phrasofix' into maintJunio C Hamano2-3/+3
2017-10-18Merge branch 'jc/merge-x-theirs-docfix' into maintJunio C Hamano1-1/+2
2017-10-18Merge branch 'rs/mailinfo-qp-decode-fix' into maintJunio C Hamano1-3/+8
2017-10-18Merge branch 'ik/userdiff-html-h-element-fix' into maintJunio C Hamano1-1/+1
2017-10-18Merge branch 'jk/diff-blob' into maintJunio C Hamano2-2/+7
2017-10-18Merge branch 'jk/describe-omit-some-refs' into maintJunio C Hamano2-4/+11
2017-10-18Merge branch 'mh/for-each-string-list-item-empty-fix' into maintJunio C Hamano1-2/+4
2017-10-18Merge branch 'tb/test-lint-echo-e' into maintJunio C Hamano1-1/+1
2017-10-18Merge branch 'aw/gc-lockfile-fscanf-fix' into maintJunio C Hamano1-1/+1
2017-10-18Merge branch 'tg/refs-allowed-flags' into maintJunio C Hamano2-0/+10
2017-10-18Merge branch 'rs/archive-excluded-directory' into maintJunio C Hamano4-21/+6
2017-10-18Merge branch 'rk/commit-tree-make-F-verbatim' into maintJunio C Hamano1-1/+0
2017-10-18Merge branch 'mh/packed-ref-store-prep' into maintJunio C Hamano2-4/+18
2017-10-18Merge branch 'mm/send-email-cc-cruft' into maintJunio C Hamano2-8/+29
2017-10-18Merge branch 'rs/strbuf-getwholeline-fix' into maintJunio C Hamano1-0/+1
2017-10-18fetch doc: src side of refspec could be full SHA-1Junio C Hamano1-2/+4
2017-10-17tag: respect color.ui configJeff King3-1/+12
2017-10-17Revert "color: check color.ui in git_default_config()"Jeff King8-9/+17
2017-10-17Revert "t6006: drop "always" color config tests"Jeff King1-5/+15
2017-10-17Revert "color: make "always" the same as "auto" in config"Jeff King3-19/+20
2017-10-17Merge branch 'jk/ui-color-always-to-auto-maint' (early part) into jk/ref-filt...Junio C Hamano18-98/+100
2017-10-11checkout doc: clarify command line args for "checkout paths" modeJunio C Hamano1-14/+16
2017-10-07completion: add --broken and --dirty to describeThomas Braun1-1/+1
2017-10-06sha1_loose_object_info: handle errors from unpack_sha1_restJeff King1-2/+6
2017-10-06.mailmap: normalize name for René ScharfeRené Scharfe1-0/+1
2017-10-06fsck: handle NULL return of lookup_blob() and lookup_tree()René Scharfe2-4/+26
2017-10-05ref-filter.c: pass empty-string as NULL to atom parsersTaylor Blau2-1/+10
2017-10-04strbuf doc: reuse after strbuf_release is fineJonathan Nieder1-2/+9
2017-10-04branch: reset instead of release a strbufStefan Beller1-2/+3
2017-10-04sub-process: use child_process.args instead of child_process.argvJohannes Sixt1-2/+1
2017-10-04http-push: fix construction of hex value from pathThomas Gummerer1-1/+1
2017-10-04path.c: fix uninitialized memory accessJeff King1-5/+4
2017-10-04test-stringlist: avoid buffer underrun when sorting nothingRené Scharfe1-1/+1
2017-10-04color: make "always" the same as "auto" in configJeff King3-19/+28
2017-10-04provide --color option for all ref-filter usersJeff King6-4/+16
2017-10-04t3205: use --color instead of color.branch=alwaysJeff King1-3/+2
2017-10-04t3203: drop "always" color testJeff King1-6/+0
2017-10-04t6006: drop "always" color config testsJeff King1-15/+5
2017-10-04t7502: use diff.noprefix for --verbose testJeff King1-2/+2
2017-10-04t7508: use test_terminal for color outputJeff King1-20/+21
2017-10-04t3701: use test-terminal to collect color outputJeff King1-5/+3
2017-10-04t4015: prefer --color to -c color.diff=alwaysJeff King1-14/+14
2017-10-04test-terminal: set TERM=vt100Jeff King7-10/+9
2017-10-03request-pull: capitalise "Git" to make it a proper nounAnn T Ropea2-3/+3
2017-10-03run-command: use ALLOC_ARRAYRené Scharfe1-1/+1
2017-10-02tag: avoid NULL pointer arithmeticRené Scharfe1-4/+4
2017-10-02coccinelle: remove parentheses that become unnecessaryRené Scharfe1-5/+5
2017-09-29fast-import: checkpoint: dump branches/tags/marks even if object_count==0Eric Rannaud2-3/+145
2017-09-29poll.c: always set revents, even if to zeroRandall S. Becker1-0/+4
2017-09-29doc: correct command formattingAdam Dinwoodie1-1/+1
2017-09-27validate_headref: use get_oid_hex for detached HEADsJeff King1-2/+2
2017-09-27validate_headref: use skip_prefix for symref parsingJeff King1-9/+6
2017-09-27validate_headref: NUL-terminate HEAD bufferJeff King1-0/+4
2017-09-25docs: improve discoverability of exclude pathspecManav Rathi5-2/+24
2017-09-25doc: camelCase the config variables to improve readabilityKaartic Sivaraam2-3/+3
2017-09-25merge-strategies: avoid implying that "-s theirs" existsJunio C Hamano1-1/+2
2017-09-24mailinfo: don't decode invalid =XY quoted-printable sequencesRené Scharfe1-3/+8
2017-09-24userdiff: fix HTML hunk header regexpIlya Kantor1-1/+1
2017-09-24doc: put literal block delimiter around tableJeff King1-0/+2
2017-09-22Git 2.14.2v2.14.2Junio C Hamano1-0/+11
2017-09-22Sync with 2.13.6Junio C Hamano10-56/+172
2017-09-22Git 2.13.6v2.13.6Junio C Hamano3-2/+19
2017-09-22Sync with 2.12.5Junio C Hamano9-56/+155
2017-09-22Git 2.12.5v2.12.5Junio C Hamano3-2/+19
2017-09-22Sync with 2.11.4Junio C Hamano8-56/+138
2017-09-22Git 2.11.4v2.11.4Junio C Hamano3-2/+19
2017-09-22Sync with 2.10.5Junio C Hamano7-56/+121
2017-09-22Git 2.10.5v2.10.5Junio C Hamano3-2/+19
2017-09-22Merge branch 'jk/safe-pipe-capture' into maint-2.10Junio C Hamano1-2/+2
2017-09-22Merge branch 'jk/cvsimport-quoting' into maint-2.10Junio C Hamano1-0/+1
2017-09-22Merge branch 'jc/cvsserver' into maint-2.10Junio C Hamano1-40/+37
2017-09-22Merge branch 'jk/git-shell-drop-cvsserver' into maint-2.10Junio C Hamano3-14/+64
2017-09-22ALLOC_GROW: avoid -Wsign-compare warningsRamsay Jones7-17/+16
2017-09-22cache.h: hex2chr() - avoid -Wsign-compare warningsRamsay Jones1-2/+2
2017-09-22commit-slab.h: avoid -Wsign-compare warningsRamsay Jones1-3/+3
2017-09-22git-compat-util.h: xsize_t() - avoid -Wsign-compare warningsRamsay Jones1-2/+4
2017-09-22cat-file: handle NULL object_context.pathJeff King2-2/+7
2017-09-22submodule.h: typofixHan-Wen Nienhuys1-1/+1
2017-09-22travis-ci: fix "skip_branch_tip_with_tag()" string comparisonLars Schneider1-1/+1
2017-09-21fast-export: do not copy from modified fileJonathan Tan2-15/+51
2017-09-21test-lint: echo -e (or -E) is not portableTorsten Bögershausen1-1/+1
2017-09-20for_each_string_list_item: avoid undefined behavior for empty listMichael Haggerty1-2/+4
2017-09-20read_info_alternates: warn on non-trivial errorsJeff King1-0/+1
2017-09-20Merge branch 'jk/info-alternates-fix-2.11' into jk/info-alternates-fixJunio C Hamano1-20/+10
2017-09-20read_info_alternates: read contents into strbufJeff King1-20/+10
2017-09-19t/README: fix typo and grammatically improve a sentenceKaartic Sivaraam1-3/+3
2017-09-17gc: call fscanf() with %<len>s, not %<len>c, when reading hostnameJunio C Hamano1-1/+1
2017-09-17describe: fix matching to actually match all patternsMax Kirillov2-4/+11
2017-09-14read_pack_header: handle signed/unsigned comparison in read resultJeff King1-1/+1
2017-09-14config: flip return value of store_write_*()Jeff King1-13/+15
2017-09-14notes-merge: use ssize_t for write_in_full() return valueJeff King1-1/+1
2017-09-14pkt-line: check write_in_full() errors against "< 0"Jeff King1-15/+14
2017-09-14convert less-trivial versions of "write_in_full() != len"Jeff King3-4/+5
2017-09-14avoid "write_in_full(fd, buf, len) != len" patternJeff King16-27/+26
2017-09-14get-tar-commit-id: check write_in_full() return against 0Jeff King1-2/+1
2017-09-14config: avoid "write_in_full(fd, buf, len) < len" patternJeff King1-4/+2
2017-09-14doc: fix minor typos (extra/duplicated words)Evan Zacks4-4/+4
2017-09-14archive: don't add empty directories to archivesRené Scharfe4-21/+6
2017-09-14refs: strip out not allowed flags from ref_transaction_updateThomas Gummerer2-0/+10
2017-09-12doc/for-each-ref: explicitly specify option namesKevin Daudt1-9/+9
2017-09-12doc/for-each-ref: consistently use '=' to between argument names and valuesKevin Daudt1-7/+8
2017-09-12cvsimport: shell-quote variable used in backticksJeff King1-0/+1
2017-09-12archimport: use safe_pipe_capture for user inputJeff King1-2/+2
2017-09-12shell: drop git-cvsserver support by defaultJeff King3-14/+64
2017-09-11cvsserver: use safe_pipe_capture for `constant commands` as wellJunio C Hamano1-4/+4
2017-09-11cvsserver: use safe_pipe_capture instead of backticksjoernchen1-11/+11
2017-09-11cvsserver: move safe_pipe_capture() to the main packageJunio C Hamano1-25/+22
2017-09-11subprocess: loudly die when subprocess asks for an unsupported capabilityJunio C Hamano1-2/+2
2017-09-11travis: dedent a few scripts that are indented overly deeplyJunio C Hamano2-33/+36
2017-09-11travis-ci: skip a branch build if equal tag is presentLars Schneider1-0/+23
2017-09-11travis-ci: move Travis CI code into dedicated scriptsLars Schneider10-81/+128
2017-09-10RelNotes: further fixes for 2.14.2 from the master frontJunio C Hamano1-0/+59
2017-09-10Merge branch 'jt/doc-pack-objects-fix' into maintJunio C Hamano1-6/+11
2017-09-10Merge branch 'jn/vcs-svn-cleanup' into maintJunio C Hamano6-86/+56
2017-09-10Merge branch 'bc/vcs-svn-cleanup' into maintJunio C Hamano3-17/+10
2017-09-10Merge branch 'jk/doc-the-this' into maintJunio C Hamano1-2/+2
2017-09-10Merge branch 'rs/commit-h-single-parent-cleanup' into maintJunio C Hamano1-5/+0
2017-09-10Merge branch 'mg/format-ref-doc-fix' into maintJunio C Hamano3-8/+9
2017-09-10Merge branch 'sb/submodule-parallel-update' into maintJunio C Hamano1-1/+0
2017-09-10Merge branch 'hv/t5526-andand-chain-fix' into maintJunio C Hamano1-4/+4
2017-09-10Merge branch 'sb/sha1-file-cleanup' into maintJunio C Hamano2-2/+2
2017-09-10Merge branch 'rs/t1002-do-not-use-sum' into maintJunio C Hamano2-35/+35
2017-09-10Merge branch 'ah/doc-empty-string-is-false' into maintJunio C Hamano2-6/+7
2017-09-10Merge branch 'rs/merge-microcleanup' into maintJunio C Hamano1-2/+2
2017-09-10Merge branch 'rs/find-pack-entry-bisection' into maintJunio C Hamano1-2/+2
2017-09-10Merge branch 'rs/apply-lose-prefix-length' into maintJunio C Hamano2-8/+5
2017-09-10Merge branch 'rj/add-chmod-error-message' into maintJunio C Hamano1-3/+3
2017-09-10Merge branch 'jk/hashcmp-memcmp' into maintJunio C Hamano1-8/+1
2017-09-10Merge branch 'rs/t3700-clean-leftover' into maintJunio C Hamano1-0/+1
2017-09-10Merge branch 'jc/perl-git-comment-typofix' into maintJunio C Hamano1-1/+1
2017-09-10Merge branch 'mf/no-dashed-subcommands' into maintJunio C Hamano5-10/+10
2017-09-10Merge branch 'ab/ref-filter-no-contains' into maintJunio C Hamano1-1/+1
2017-09-10Merge branch 'rs/archive-excluded-directory' into maintJunio C Hamano2-11/+85
2017-09-10Merge branch 'mg/killed-merge' into maintJunio C Hamano3-4/+31
2017-09-10Merge branch 'tb/apply-with-crlf' into maintJunio C Hamano4-16/+71
2017-09-10Merge branch 'cc/subprocess-handshake-missing-capabilities' into maintJunio C Hamano1-2/+2
2017-09-10Merge branch 'as/grep-quiet-no-match-exit-code-fix' into maintJunio C Hamano2-1/+6
2017-09-10Merge branch 'kd/stash-with-bash-4.4' into maintJunio C Hamano1-2/+9
2017-09-10Merge branch 'rs/win32-syslog-leakfix' into maintJunio C Hamano1-0/+2
2017-09-10Merge branch 'rs/unpack-entry-leakfix' into maintJunio C Hamano1-2/+3
2017-09-10Merge branch 'rs/fsck-obj-leakfix' into maintJunio C Hamano1-11/+11
2017-09-10Merge branch 'ur/svn-local-zone' into maintJunio C Hamano1-1/+1
2017-09-10Merge branch 'pw/am-signoff' into maintJunio C Hamano2-45/+64
2017-09-10Merge branch 'rs/in-obsd-basename-dirname-take-const' into maintJunio C Hamano1-2/+16
2017-09-10Merge branch 'rs/t4062-obsd' into maintJunio C Hamano1-1/+3
2017-09-10Merge branch 'rs/obsd-getcwd-workaround' into maintJunio C Hamano1-2/+28
2017-09-10Merge branch 'bw/clone-recursive-quiet' into maintJunio C Hamano2-0/+9
2017-09-10Merge branch 'pw/sequence-rerere-autoupdate' into maintJunio C Hamano7-50/+171
2017-09-10Merge branch 'bw/push-options-recursively-to-submodules' into maintJunio C Hamano3-13/+79
2017-09-10Merge branch 'ma/pager-per-subcommand-action' into maintJunio C Hamano6-76/+201
2017-09-10Merge branch 'jk/rev-list-empty-input' into maintJunio C Hamano5-13/+26
2017-09-10Merge branch 'st/lib-gpg-kill-stray-agent' into maintJunio C Hamano1-0/+1
2017-09-10commit-tree: do not complete line in -F inputRoss Kabus1-1/+0
2017-09-07git_extract_argv0_path: do nothing without RUNTIME_PREFIXJeff King1-14/+19
2017-09-07system_path: move RUNTIME_PREFIX to a sub-functionJeff King1-12/+21
2017-09-07Documentation: mention that `eol` can change the dirty status of pathsBen Boeckel1-1/+4
2017-09-07rev-parse: don't trim bisect refnamesJeff King2-4/+18