summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2017-10-05Git 2.15-rc0v2.15.0-rc0Junio C Hamano2-1/+17
2017-10-05Merge branch 'ar/request-pull-phrasofix'Junio C Hamano2-3/+3
2017-10-05Merge branch 'rs/run-command-use-alloc-array'Junio C Hamano1-1/+1
2017-10-05Merge branch 'sb/git-clang-format'Junio C Hamano1-1/+5
2017-10-05Merge branch 'rs/use-free-and-null'Junio C Hamano1-18/+9
2017-10-05Merge branch 'rs/tag-null-pointer-arith-fix'Junio C Hamano1-4/+4
2017-10-05Merge branch 'rs/cocci-de-paren-call-params'Junio C Hamano1-5/+5
2017-10-05Merge branch 'rs/cleanup-strbuf-users'Junio C Hamano5-12/+8
2017-10-05Merge branch 'rs/resolve-ref-optional-result'Junio C Hamano7-20/+9
2017-10-05Merge branch 'er/fast-import-dump-refs-on-checkpoint'Junio C Hamano2-3/+145
2017-10-03The twelfth batch for 2.15Junio C Hamano1-0/+24
2017-10-03Merge branch 'bw/git-clang-format'Junio C Hamano1-6/+6
2017-10-03Merge branch 'ad/doc-markup-fix'Junio C Hamano1-1/+1
2017-10-03Merge branch 'mh/mmap-packed-refs'Junio C Hamano9-369/+848
2017-10-03Merge branch 'mr/doc-negative-pathspec'Junio C Hamano5-2/+24
2017-10-03Merge branch 'sb/submodule-diff-header-fix'Junio C Hamano2-2/+2
2017-10-03Merge branch 'sb/diff-color-move'Junio C Hamano7-0/+35
2017-10-03Merge branch 'sb/test-submodule-update-config'Junio C Hamano1-0/+8
2017-10-03Merge branch 'jk/validate-headref-fix'Junio C Hamano1-11/+12
2017-10-03Merge branch 'jk/read-in-full'Junio C Hamano10-17/+55
2017-10-03Merge branch 'jk/no-optional-locks'Junio C Hamano6-1/+41
2017-10-03Merge branch 'hn/string-list-doc'Junio C Hamano2-239/+162
2017-10-03Merge branch 'hn/path-ownership-comment'Junio C Hamano2-1/+6
2017-10-03Merge branch 'hn/submodule-comment'Junio C Hamano1-0/+4
2017-10-03Merge branch 'sd/branch-copy'Junio C Hamano10-48/+478
2017-10-03Merge branch 'bc/rev-parse-parseopt-fix'Junio C Hamano6-10/+139
2017-10-03Merge branch 'js/rebase-i-final'Junio C Hamano7-360/+647
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-02clang-format: add a comment about the meaning/status of theStephan Beyer1-1/+5
2017-10-02repository: use FREE_AND_NULLRené Scharfe1-18/+9
2017-10-02tag: avoid NULL pointer arithmeticRené Scharfe1-4/+4
2017-10-02graph: use strbuf_addchars() to add spacesRené Scharfe1-7/+3
2017-10-02use strbuf_addstr() for adding strings to strbufsRené Scharfe3-4/+4
2017-10-02path: use strbuf_add_real_path()René Scharfe1-1/+1
2017-10-02coccinelle: remove parentheses that become unnecessaryRené Scharfe1-5/+5
2017-10-01refs: pass NULL to resolve_refdup() if hash is not neededRené Scharfe6-18/+8
2017-10-01refs: pass NULL to refs_resolve_refdup() if hash is not neededRené Scharfe1-2/+1
2017-10-01clang-format: adjust line break penaltiesJohannes Schindelin1-6/+6
2017-09-29fast-import: checkpoint: dump branches/tags/marks even if object_count==0Eric Rannaud2-3/+145
2017-09-29The eleventh batch for 2.15Junio C Hamano1-0/+18
2017-09-29Merge branch 'sb/doc-config-submodule-update'Junio C Hamano1-4/+8
2017-09-29Merge branch 'ma/leakplugs'Junio C Hamano17-35/+75
2017-09-29Merge branch 'rj/no-sign-compare'Junio C Hamano10-24/+25
2017-09-29Merge branch 'sb/merge-commit-msg-hook'Junio C Hamano1-5/+4
2017-09-29Merge branch 'jt/fast-export-copy-modify-fix'Junio C Hamano2-15/+51
2017-09-29Merge branch 'mk/describe-match-with-all'Junio C Hamano3-22/+58
2017-09-29Merge branch 'jm/status-ignored-directory-optim'Junio C Hamano1-6/+41
2017-09-29doc: correct command formattingAdam Dinwoodie1-1/+1
2017-09-28The tenth batch for 2.15Junio C Hamano1-0/+47
2017-09-28Merge branch 'js/win32-lazyload-dll'Junio C Hamano1-0/+57
2017-09-28Merge branch 'jc/merge-x-theirs-docfix'Junio C Hamano1-1/+2
2017-09-28Merge branch 'ks/doc-use-camelcase-for-config-name'Junio C Hamano2-3/+3
2017-09-28Merge branch 'mk/diff-delta-avoid-large-offset'Junio C Hamano1-0/+3
2017-09-28Merge branch 'mk/diff-delta-uint-may-be-shorter-than-ulong'Junio C Hamano1-11/+13
2017-09-28Merge branch 'rs/resolve-ref-optional-result'Junio C Hamano17-46/+29
2017-09-28Merge branch 'rs/mailinfo-qp-decode-fix'Junio C Hamano1-3/+8
2017-09-28Merge branch 'jk/doc-read-tree-table-asciidoctor-fix'Junio C Hamano1-0/+2
2017-09-28Merge branch 'ik/userdiff-html-h-element-fix'Junio C Hamano1-1/+1
2017-09-28Merge branch 'jk/fallthrough'Junio C Hamano15-28/+30
2017-09-28Merge branch 'jk/diff-blob'Junio C Hamano2-2/+7
2017-09-28Merge branch 'hn/typofix'Junio C Hamano1-1/+1
2017-09-28Merge branch 'ic/fix-filter-branch-to-handle-tag-without-tagger'Junio C Hamano2-8/+94
2017-09-28Merge branch 'jk/describe-omit-some-refs'Junio C Hamano2-4/+11
2017-09-28submodule: correct error message for missing commitsStefan Beller2-2/+2
2017-09-28diff: correct newline in summary for renamed filesStefan Beller7-0/+35
2017-09-27git: add --no-optional-locks optionJeff King6-1/+41
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-27worktree: check the result of read_in_full()Jeff King1-1/+18
2017-09-27worktree: use xsize_t to access file sizeJeff King1-2/+3
2017-09-27distinguish error versus short read from read_in_full()Jeff King3-4/+16
2017-09-27avoid looking at errno for short read_in_full() returnsJeff King2-4/+14
2017-09-27prefer "!=" when checking read_in_full() resultJeff King3-3/+3
2017-09-27t7406: submodule.<name>.update command must not be run from .gitmodulesStefan Beller1-0/+8
2017-09-27string-list.h: move documentation from Documentation/api/ into headerHan-Wen Nienhuys2-239/+162
2017-09-27read_gitfile_gently: clarify return value ownership.Han-Wen Nienhuys1-1/+2
2017-09-27real_path: clarify return value ownershipHan-Wen Nienhuys1-0/+4
2017-09-26Sync with 2.14.2Junio C Hamano11-56/+183
2017-09-26submodule.c: describe submodule_to_gitdir() in a new commentHan-Wen Nienhuys1-0/+4
2017-09-26notes-merge: drop dead zero-write codeJeff King1-2/+0
2017-09-26files-backend: prefer "0" for write_in_full() error checkJeff King1-1/+1
2017-09-26Win32: simplify loading of DLL functionsJohannes Schindelin1-0/+57
2017-09-25packed-backend.c: rename a bunch of things and update commentsMichael Haggerty1-190/+232
2017-09-25mmapped_ref_iterator: inline into `packed_ref_iterator`Michael Haggerty1-170/+114
2017-09-25ref_cache: remove support for storing peeled valuesMichael Haggerty3-72/+11
2017-09-25packed_ref_store: get rid of the `ref_cache` entirelyMichael Haggerty1-27/+2
2017-09-25ref_store: implement `refs_peel_ref()` genericallyMichael Haggerty4-78/+17
2017-09-25packed_read_raw_ref(): read the reference from the mmapped bufferMichael Haggerty1-5/+9
2017-09-25packed_ref_iterator_begin(): iterate using `mmapped_ref_iterator`Michael Haggerty1-3/+106
2017-09-25read_packed_refs(): ensure that references are ordered when readMichael Haggerty1-11/+212
2017-09-25packed_ref_cache: keep the `packed-refs` file mmapped if possibleMichael Haggerty3-42/+152
2017-09-25packed-backend.c: reorder some definitionsMichael Haggerty1-24/+24
2017-09-25mmapped_ref_iterator_advance(): no peeled value for broken refsMichael Haggerty1-2/+8
2017-09-25mmapped_ref_iterator: add iterator over a packed-refs fileMichael Haggerty1-55/+152
2017-09-25packed_ref_cache: remember the file-wide peeling stateMichael Haggerty1-5/+12
2017-09-25read_packed_refs(): read references with minimal copyingMichael Haggerty1-61/+40
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-25The ninth batch for 2.15Junio C Hamano1-0/+67
2017-09-25Merge branch 'ks/test-readme-phrasofix'Junio C Hamano1-3/+3
2017-09-25Merge branch 'ow/rev-parse-is-shallow-repo'Junio C Hamano3-0/+23
2017-09-25Merge branch 'rj/test-ulimit-on-windows'Junio C Hamano5-40/+42
2017-09-25Merge branch 'jk/info-alternates-fix'Junio C Hamano1-20/+11
2017-09-25Merge branch 'mh/for-each-string-list-item-empty-fix'Junio C Hamano1-2/+4
2017-09-25Merge branch 'tb/test-lint-echo-e'Junio C Hamano1-1/+1
2017-09-25Merge branch 'jk/revision-remove-cmdline-pathspec'Junio C Hamano3-32/+18
2017-09-25Merge branch 'ls/travis-scriptify'Junio C Hamano10-81/+154
2017-09-25Merge branch 'aw/gc-lockfile-fscanf-fix'Junio C Hamano1-1/+1
2017-09-25Merge branch 'hv/mv-nested-submodules-test'Junio C Hamano1-0/+25
2017-09-25Merge branch 'bw/git-clang-format'Junio C Hamano2-0/+169
2017-09-25Merge branch 'nm/imap-send-with-curl'Junio C Hamano1-20/+41
2017-09-25Merge branch 'ks/commit-do-not-touch-cut-line'Junio C Hamano1-1/+1
2017-09-25Merge branch 'tg/refs-allowed-flags'Junio C Hamano2-0/+10
2017-09-25Merge branch 'rs/archive-excluded-directory'Junio C Hamano4-21/+6
2017-09-25Merge branch 'ks/help-alias-label'Junio C Hamano1-1/+1
2017-09-25Merge branch 'jn/per-repo-object-store-fixes'Junio C Hamano6-20/+45
2017-09-25Merge branch 'jk/write-in-full-fix'Junio C Hamano22-67/+65
2017-09-25Merge branch 'ez/doc-duplicated-words-fix'Junio C Hamano4-4/+4
2017-09-25Merge branch 'kd/doc-for-each-ref'Junio C Hamano1-16/+17
2017-09-25Merge branch 'cc/subprocess-handshake-missing-capabilities'Junio C Hamano1-2/+2
2017-09-25Merge branch 'kw/write-index-reduce-alloc'Junio C Hamano2-1/+4
2017-09-25Merge branch 'mg/name-rev-tests-with-short-stack'Junio C Hamano3-6/+63
2017-09-25parse-options: only insert newline in help text if neededBrandon Casey2-4/+10
2017-09-25parse-options: write blank line to correct output streamBrandon Casey3-5/+5
2017-09-25t0040,t1502: Demonstrate parse_options bugsBrandon Casey3-3/+107
2017-09-25merge-strategies: avoid implying that "-s theirs" existsJunio C Hamano1-1/+2
2017-09-24Documentation/config: clarify the meaning of submodule.<name>.updateStefan Beller1-4/+8
2017-09-24mailinfo: don't decode invalid =XY quoted-printable sequencesRené Scharfe1-3/+8
2017-09-24refs: pass NULL to resolve_ref_unsafe() if hash is not neededRené Scharfe14-38/+19
2017-09-24refs: pass NULL to refs_resolve_ref_unsafe() if hash is not neededRené Scharfe2-4/+2
2017-09-24refs: make sha1 output parameter of refs_resolve_ref_unsafe() optionalRené Scharfe2-4/+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-24pack-bitmap[-write]: use `object_array_clear()`, don't leakMartin Ågren2-10/+4
2017-09-24object_array: add and use `object_array_pop()`Martin Ågren6-10/+25
2017-09-24object_array: use `object_array_clear()`, not `free()`Martin Ågren4-7/+6
2017-09-24leak_pending: use `object_array_clear()`, not `free()`Martin Ågren4-3/+29
2017-09-24commit: fix memory leak in `reduce_heads()`Martin Ågren1-0/+1
2017-09-24builtin/commit: fix memory leak in `prepare_index()`Martin Ågren1-5/+10
2017-09-24branch: fix "copy" to never touch HEADJunio C Hamano2-11/+8
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-22filter-branch: use hash-object instead of mktagIan Campbell1-1/+1
2017-09-22filter-branch: stash away ref map in a branchIan Campbell2-2/+55
2017-09-22filter-branch: preserve and restore $GIT_AUTHOR_* and $GIT_COMMITTER_*Ian Campbell1-0/+33
2017-09-22filter-branch: reset $GIT_* before cleaning upIan Campbell1-5/+5
2017-09-22consistently use "fallthrough" comments in switchesJeff King13-4/+15
2017-09-22curl_trace(): eliminate switch fallthroughJeff King1-3/+4
2017-09-22test-line-buffer: simplify command parsingJeff King1-21/+11
2017-09-22cat-file: handle NULL object_context.pathJeff King2-2/+7
2017-09-22submodule.h: typofixHan-Wen Nienhuys1-1/+1
2017-09-22Documentation/githooks: mention merge in commit-msg hookStefan Beller1-5/+4
2017-09-22travis-ci: fix "skip_branch_tip_with_tag()" string comparisonLars Schneider1-1/+1
2017-09-21pathspec doc: parse_pathspec does not maintain references to argsJonathan Nieder2-4/+7
2017-09-21Merge branch 'jk/leak-checkers'Junio C Hamano1-2/+2
2017-09-21fast-export: do not copy from modified fileJonathan Tan2-15/+51
2017-09-21revision: replace "struct cmdline_pathspec" with argv_arrayJeff King1-28/+11
2017-09-21test-lint: echo -e (or -E) is not portableTorsten Bögershausen1-1/+1
2017-09-20git-compat-util: make UNLEAK less error-proneJonathan Tan1-2/+2
2017-09-20for_each_string_list_item: avoid undefined behavior for empty listMichael Haggerty1-2/+4
2017-09-20describe: teach --match to handle branches and remotesMax Kirillov3-22/+58
2017-09-20Merge branch 'jk/describe-omit-some-refs' into mk/describe-match-with-allJunio C Hamano2-4/+11
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-19t9010-*.sh: skip all tests if the PIPE prereq is missingRamsay Jones1-27/+28
2017-09-19test-lib: use more compact expression in PIPE prerequisiteRamsay Jones1-8/+2
2017-09-19Improve performance of git status --ignoredJameson Miller1-6/+41
2017-09-19rev-parse: rev-parse: add --is-shallow-repositoryØystein Walle3-0/+23
2017-09-19git-rebase: don't ignore unexpected command line argumentsBrandon Casey1-0/+3
2017-09-19rev-parse parseopt: interpret any whitespace as start of help textBrandon Casey2-3/+11
2017-09-19rev-parse parseopt: do not search help text for flag charsBrandon Casey2-4/+6
2017-09-19t1502: demonstrate rev-parse --parseopt option mis-parsingBrandon Casey1-6/+12
2017-09-19t/README: fix typo and grammatically improve a sentenceKaartic Sivaraam1-3/+3
2017-09-19The eighth batch for 2.15Junio C Hamano1-0/+58
2017-09-19Merge branch 'rk/commit-tree-make-F-verbatim'Junio C Hamano1-1/+0
2017-09-19Merge branch 'rs/strbuf-leakfix'Junio C Hamano22-36/+83
2017-09-19Merge branch 'jk/shortlog-ident-cleanup'Junio C Hamano1-21/+35
2017-09-19Merge branch 'mh/packed-ref-transactions'Junio C Hamano5-216/+551
2017-09-19Merge branch 'kw/merge-recursive-cleanup'Junio C Hamano2-22/+57
2017-09-19Merge branch 'sb/merge-commit-msg-hook'Junio C Hamano2-4/+68
2017-09-19Merge branch 'jk/leak-checkers'Junio C Hamano15-24/+92
2017-09-19Merge branch 'nm/pull-submodule-recurse-config'Junio C Hamano2-2/+38