summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2017-10-07Merge branch 'tg/memfixes'Libravatar Junio C Hamano3-8/+6
2017-10-07Merge branch 'sb/branch-avoid-repeated-strbuf-release'Libravatar Junio C Hamano1-2/+3
2017-10-07Merge branch 'rs/qsort-s'Libravatar Junio C Hamano1-1/+1
2017-10-07Merge branch 'jn/strbuf-doc-re-reuse'Libravatar Junio C Hamano1-2/+9
2017-10-07Merge branch 'tb/delimit-pretty-trailers-args-with-comma'Libravatar Junio C Hamano2-7/+30
2017-10-07completion: add --broken and --dirty to describeLibravatar Thomas Braun1-1/+1
2017-10-07tests: fix diff order arguments in test_cmpLibravatar Stefan Beller15-42/+42
2017-10-07refs_resolve_ref_unsafe: handle d/f conflicts for writesLibravatar Jeff King3-2/+49
2017-10-07t3308: create a real ref directory/file conflictLibravatar Jeff King1-1/+1
2017-10-06api-argv-array.txt: remove broken link to string-list APILibravatar Todd Zullinger1-1/+1
2017-10-06entry.c: check if file exists after checkoutLibravatar Lars Schneider1-1/+3
2017-10-06sha1_loose_object_info: handle errors from unpack_sha1_restLibravatar Jeff King1-2/+6
2017-10-06.mailmap: normalize name for René ScharfeLibravatar René Scharfe1-0/+1
2017-10-06fsck: handle NULL return of lookup_blob() and lookup_tree()Libravatar René Scharfe2-4/+26
2017-10-05entry.c: update cache entry only for existing filesLibravatar Lars Schneider1-1/+2
2017-10-05Git 2.15-rc0Libravatar Junio C Hamano2-1/+17
2017-10-05Merge branch 'ar/request-pull-phrasofix'Libravatar Junio C Hamano2-3/+3
2017-10-05Merge branch 'rs/run-command-use-alloc-array'Libravatar Junio C Hamano1-1/+1
2017-10-05Merge branch 'sb/git-clang-format'Libravatar Junio C Hamano1-1/+5
2017-10-05Merge branch 'rs/use-free-and-null'Libravatar Junio C Hamano1-18/+9
2017-10-05Merge branch 'rs/tag-null-pointer-arith-fix'Libravatar Junio C Hamano1-4/+4
2017-10-05Merge branch 'rs/cocci-de-paren-call-params'Libravatar Junio C Hamano1-5/+5
2017-10-05Merge branch 'rs/cleanup-strbuf-users'Libravatar Junio C Hamano5-12/+8
2017-10-05Merge branch 'rs/resolve-ref-optional-result'Libravatar Junio C Hamano7-20/+9
2017-10-05Merge branch 'er/fast-import-dump-refs-on-checkpoint'Libravatar Junio C Hamano2-3/+145
2017-10-05ref-filter.c: pass empty-string as NULL to atom parsersLibravatar Taylor Blau2-1/+10
2017-10-04strbuf doc: reuse after strbuf_release is fineLibravatar Jonathan Nieder1-2/+9
2017-10-04branch: reset instead of release a strbufLibravatar Stefan Beller1-2/+3
2017-10-04sub-process: use child_process.args instead of child_process.argvLibravatar Johannes Sixt1-2/+1
2017-10-04http-push: fix construction of hex value from pathLibravatar Thomas Gummerer1-1/+1
2017-10-04path.c: fix uninitialized memory accessLibravatar Jeff King1-5/+4
2017-10-04test-stringlist: avoid buffer underrun when sorting nothingLibravatar René Scharfe1-1/+1
2017-10-04setup: update error message to be more meaningfulLibravatar Kaartic Sivaraam1-1/+1
2017-10-04branch: change the error messages to be more meaningfulLibravatar Kaartic Sivaraam1-3/+3
2017-10-04Merge branch 'jk/ui-color-always-to-auto-maint' into jk/ui-color-always-to-autoLibravatar Junio C Hamano19-99/+101
2017-10-04t7301: use test_terminal to check colorLibravatar Jeff King1-2/+3
2017-10-04t4015: use --color with --color-movedLibravatar Jeff King1-13/+12
2017-10-04color: make "always" the same as "auto" in configLibravatar Jeff King3-19/+28
2017-10-04provide --color option for all ref-filter usersLibravatar Jeff King6-4/+16
2017-10-04t3205: use --color instead of color.branch=alwaysLibravatar Jeff King1-3/+2
2017-10-04t3203: drop "always" color testLibravatar Jeff King1-6/+0
2017-10-04t6006: drop "always" color config testsLibravatar Jeff King1-15/+5
2017-10-04t7502: use diff.noprefix for --verbose testLibravatar Jeff King1-2/+2
2017-10-04t7508: use test_terminal for color outputLibravatar Jeff King1-20/+21
2017-10-04t3701: use test-terminal to collect color outputLibravatar Jeff King1-5/+3
2017-10-04t4015: prefer --color to -c color.diff=alwaysLibravatar Jeff King1-14/+14
2017-10-04test-terminal: set TERM=vt100Libravatar Jeff King7-10/+9
2017-10-03The twelfth batch for 2.15Libravatar Junio C Hamano1-0/+24
2017-10-03Merge branch 'bw/git-clang-format'Libravatar Junio C Hamano1-6/+6
2017-10-03Merge branch 'ad/doc-markup-fix'Libravatar Junio C Hamano1-1/+1