summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ls/t0021-fixup' into maintJunio C Hamano2017-01-171-3/+2
|\
| * t0021: minor filter process test cleanupls/t0021-fixupLars Schneider2016-12-051-3/+2
* | Merge branch 'ak/lazy-prereq-mktemp' into maintJunio C Hamano2017-01-171-1/+2
|\ \
| * | t7610: clean up foo.XXXXXX tmpdirak/lazy-prereq-mktempJeff King2016-11-291-1/+2
* | | Merge branch 'nd/qsort-in-merge-recursive' into maintJunio C Hamano2017-01-171-9/+7
|\ \ \
| * | | merge-recursive.c: use string_list_sort instead of qsortnd/qsort-in-merge-recursiveNguyễn Thái Ngọc Duy2016-11-281-9/+7
* | | | Merge branch 'dt/smart-http-detect-server-going-away' into maintJunio C Hamano2017-01-175-4/+77
|\ \ \ \
| * | | | upload-pack: optionally allow fetching any sha1dt/smart-http-detect-server-going-awayDavid Turner2016-11-184-4/+39
| * | | | remote-curl: don't hang when a server dies before any outputDavid Turner2016-11-182-0/+38
* | | | | Merge branch 'mk/mingw-winansi-ttyname-termination-fix' into maintJunio C Hamano2017-01-171-1/+1
|\ \ \ \ \
| * | | | | mingw: consider that UNICODE_STRING::Length counts bytesmk/mingw-winansi-ttyname-termination-fixMax Kirillov2016-12-201-1/+1
* | | | | | Merge branch 'gv/p4-multi-path-commit-fix' into maintJunio C Hamano2017-01-172-3/+23
|\ \ \ \ \ \
| * | | | | | git-p4: fix multi-path changelist empty commitsgv/p4-multi-path-commit-fixGeorge Vanburgh2016-12-192-3/+23
* | | | | | | Merge branch 'jk/difftool-in-subdir' into maintJunio C Hamano2017-01-171-24/+29
|\ \ \ \ \ \ \
| * | | | | | | difftool: rename variables for consistencyjk/difftool-in-subdirDavid Aguilar2016-12-111-14/+14
| * | | | | | | difftool: chdir as early as possibleDavid Aguilar2016-12-111-12/+14
| * | | | | | | difftool: sanitize $workdir as early as possibleDavid Aguilar2016-12-111-3/+2
| * | | | | | | difftool: fix dir-diff index creation when in a subdirectoryDavid Aguilar2016-12-112-3/+45
* | | | | | | | Merge branch 'ld/p4-compare-dir-vs-symlink' into maintJunio C Hamano2017-01-172-6/+63
|\ \ \ \ \ \ \ \
| * | | | | | | | git-p4: avoid crash adding symlinked directoryld/p4-compare-dir-vs-symlinkLuke Diamand2016-12-182-6/+63
* | | | | | | | | Merge branch 'jc/push-default-explicit' into maintJunio C Hamano2017-01-172-2/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | push: test pushing ambiguously named branchesjc/push-default-explicitDennis Kaarsemaker2016-10-311-0/+10
| * | | | | | | | | push: do not use potentially ambiguous default refspecJunio C Hamano2016-10-281-2/+5
* | | | | | | | | | Merge branch 'jt/mailinfo-fold-in-body-headers' into maintJunio C Hamano2017-01-171-1/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | mailinfo.c: move side-effects outside of assertjt/mailinfo-fold-in-body-headersKyle J. McKay2016-12-201-1/+2
* | | | | | | | | | | Merge branch 'jk/index-pack-wo-repo-from-stdin' into maintJunio C Hamano2017-01-177-47/+42
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | index-pack: skip collision check when not in repositoryjk/index-pack-wo-repo-from-stdinJeff King2016-12-161-4/+6
| * | | | | | | | | | | t: use nongit() function where applicableJeff King2016-12-163-29/+5
| * | | | | | | | | | | index-pack: complain when --stdin is used outside of a repoJeff King2016-12-162-0/+17
| * | | | | | | | | | | t5000: extract nongit function to test-lib-functions.shJeff King2016-12-162-14/+14
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jk/parseopt-usage-msg-opt' into maintJunio C Hamano2017-01-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | parse-options: print "fatal:" before usage_msg_opt()jk/parseopt-usage-msg-optJeff King2016-12-141-1/+1
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jk/quote-env-path-list-component' into maintJunio C Hamano2017-01-175-12/+102
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | t5615-alternate-env: double-quotes in file names do not work on WindowsJohannes Sixt2016-12-211-1/+1
| * | | | | | | | | | | t5547-push-quarantine: run the path separator test on Windows, tooJohannes Sixt2016-12-131-4/+10
| * | | | | | | | | | | tmp-objdir: quote paths we add to alternatesJeff King2016-12-122-1/+36
| * | | | | | | | | | | alternates: accept double-quoted pathsJeff King2016-12-123-11/+60
| * | | | | | | | | | | Merge branch 'jk/alt-odb-cleanup' into jk/quote-env-path-list-componentJunio C Hamano2016-12-122-1/+72
| |\ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/shallow-fixup' into maintJunio C Hamano2017-01-171-19/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | shallow.c: remove useless codend/shallow-fixupNguyễn Thái Ngọc Duy2016-12-071-4/+0
| * | | | | | | | | | | | | shallow.c: bit manipulation tweaksRasmus Villemoes2016-12-071-4/+4
| * | | | | | | | | | | | | shallow.c: avoid theoretical pointer wrap-aroundRasmus Villemoes2016-12-071-1/+1
| * | | | | | | | | | | | | shallow.c: make paint_alloc slightly more robustNguyễn Thái Ngọc Duy2016-12-071-0/+3
| * | | | | | | | | | | | | shallow.c: stop abusing COMMIT_SLAB_SIZE for paint_info's memory poolsNguyễn Thái Ngọc Duy2016-12-071-2/+4
| * | | | | | | | | | | | | shallow.c: rename fields in paint_info to better express their purposesNguyễn Thái Ngọc Duy2016-12-071-9/+9
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'sb/sequencer-abort-safety' into maintJunio C Hamano2017-01-173-2/+61
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Revert "sequencer: remove useless get_dir() function"sb/sequencer-abort-safetyJunio C Hamano2016-12-141-1/+6
| * | | | | | | | | | | | | sequencer: remove useless get_dir() functionStephan Beyer2016-12-091-6/+1
| * | | | | | | | | | | | | sequencer: make sequencer abort saferStephan Beyer2016-12-092-1/+50
| * | | | | | | | | | | | | t3510: test that cherry-pick --abort does not unsafely change HEADStephan Beyer2016-12-091-0/+10
View Lorry Controller Status