summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2017-03-17Merge branch 'jk/cherry-pick-0-mainline'Libravatar Junio C Hamano2-1/+29
2017-03-17Merge branch 'js/early-config'Libravatar Junio C Hamano7-111/+313
2017-03-17Merge branch 'bc/sha1-header-selection-with-cpp-macros'Libravatar Junio C Hamano3-8/+20
2017-03-17Merge branch 'mg/status-porcelain-no-i18n'Libravatar Junio C Hamano1-4/+4
2017-03-17Merge branch 'jk/add-i-use-pathspecs'Libravatar Junio C Hamano2-11/+45
2017-03-17Merge branch 'jk/http-walker-buffer-underflow-fix'Libravatar Junio C Hamano1-4/+7
2017-03-17Merge branch 'bw/attr-pathspec'Libravatar Junio C Hamano7-10/+446
2017-03-17Merge branch 'jk/ref-filter-flags-cleanup'Libravatar Junio C Hamano2-31/+44
2017-03-17Merge branch 'sb/rev-parse-show-superproject-root'Libravatar Junio C Hamano5-0/+117
2017-03-17Merge branch 'bc/object-id'Libravatar Junio C Hamano33-462/+494
2017-03-17Merge branch 'rs/blame-code-cleanup'Libravatar Junio C Hamano1-17/+8
2017-03-17Merge branch 'jk/interop-test'Libravatar Junio C Hamano8-1/+270
2017-03-17Merge branch 'cc/split-index-config'Libravatar Junio C Hamano11-131/+540
2017-03-17grep: set default output methodLibravatar Brandon Williams1-5/+7
2017-03-17ls-files: fix bug when recursing with relative pathspecLibravatar Brandon Williams2-12/+52
2017-03-17ls-files: fix typo in variable nameLibravatar Brandon Williams1-8/+8
2017-03-17grep: fix bug when recursing with relative pathspecLibravatar Brandon Williams2-15/+99
2017-03-17setup: allow for prefix to be passed to git commandsLibravatar Brandon Williams3-3/+7
2017-03-17grep: fix help text typoLibravatar Brandon Williams1-1/+1
2017-03-17credential-cache: add tests for XDG functionalityLibravatar Devin Lehmacher1-0/+93
2017-03-17credential-cache: use XDG_CACHE_HOME for socketLibravatar Devin Lehmacher2-5/+21
2017-03-17submodule--helper clone: check for configured submodules using helperLibravatar Brandon Williams1-12/+3
2017-03-17submodule sync: use submodule--helper is-activeLibravatar Brandon Williams1-2/+2
2017-03-17submodule sync: skip work for inactive submodulesLibravatar Brandon Williams1-17/+21
2017-03-17submodule status: use submodule--helper is-activeLibravatar Brandon Williams1-2/+1
2017-03-17submodule--helper: add is-active subcommandLibravatar Brandon Williams2-0/+42
2017-03-17Makefile: make DC_SHA1 the defaultLibravatar Junio C Hamano1-6/+10
2017-03-17t0013: add a basic sha1 collision detection testLibravatar Jeff King3-0/+20
2017-03-17Makefile: add DC_SHA1 knobLibravatar Jeff King4-0/+47
2017-03-17wt-status: simplify by using for_each_string_list_itemLibravatar Stefan Beller1-15/+5
2017-03-17sequencer: drop "warning:" when stopping for editLibravatar Jeff King1-1/+2
2017-03-16sha1dc: disable safe_hash featureLibravatar Jeff King1-1/+1
2017-03-16sha1dc: adjust header includes for gitLibravatar Jeff King4-13/+9
2017-03-16sha1dc: add collision-detecting sha1 implementationLibravatar Jeff King5-0/+2336
2017-03-16builtin/read-tree: add --recurse-submodules switchLibravatar Stefan Beller4-1/+49
2017-03-16builtin/checkout: add --recurse-submodules switchLibravatar Stefan Beller4-5/+62
2017-03-16entry.c: create submodules when interestingLibravatar Stefan Beller1-0/+30
2017-03-16unpack-trees: check if we can perform the operation for submodulesLibravatar Stefan Beller2-9/+123
2017-03-16unpack-trees: pass old oid to verify_clean_submoduleLibravatar Stefan Beller1-7/+10
2017-03-16update submodules: add submodule_move_headLibravatar Stefan Beller2-0/+144
2017-03-16submodule.c: get_super_prefix_or_emptyLibravatar Stefan Beller1-6/+10
2017-03-16Sync with 'maint'Libravatar Junio C Hamano1-0/+41
2017-03-16Preparing for 2.12.1Libravatar Junio C Hamano3-2/+43
2017-03-16Merge branch 'js/realpath-pathdup-fix' into maintLibravatar Junio C Hamano10-18/+26
2017-03-16Merge branch 'mm/two-more-xstrfmt' into maintLibravatar Junio C Hamano2-11/+9
2017-03-16Merge branch 'vn/line-log-memcpy-size-fix' into maintLibravatar Junio C Hamano1-1/+2
2017-03-16Merge branch 'ax/line-log-range-merge-fix' into maintLibravatar Junio C Hamano2-8/+17
2017-03-16Merge branch 'jk/add-i-patch-do-prompt' into maintLibravatar Junio C Hamano2-4/+22
2017-03-16Merge branch 'jt/http-base-url-update-upon-redirect' into maintLibravatar Junio C Hamano3-0/+21
2017-03-16Merge branch 'js/travis-32bit-linux' into maintLibravatar Junio C Hamano2-0/+51