summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* test-lib: on FreeBSD, look for unzip(1) in /usr/local/bin/js/unzip-in-usr-bin-workaroundJohannes Schindelin2017-01-271-1/+3
* Almost ready for 2.11.1Junio C Hamano2017-01-174-3/+124
* Merge branch 'mm/gc-safety-doc' into maintJunio C Hamano2017-01-172-9/+29
|\
| * git-gc.txt: expand discussion of races with other processesmm/gc-safety-docMatt McCutchen2016-11-162-9/+29
* | Merge branch 'mm/push-social-engineering-attack-doc' into maintJunio C Hamano2017-01-176-22/+51
|\ \
| * | doc: mention transfer data leaks in more placesmm/push-social-engineering-attack-docMatt McCutchen2016-11-146-22/+51
| |/
* | Merge branch 'jt/fetch-no-redundant-tag-fetch-map' into maintJunio C Hamano2017-01-171-3/+0
|\ \
| * | fetch: do not redundantly calculate tag refmapjt/fetch-no-redundant-tag-fetch-mapJonathan Tan2016-11-111-3/+0
| |/
* | Merge branch 'ls/filter-process' into maintJunio C Hamano2017-01-174-29/+24
|\ \
| * | t0021: fix flaky testls/filter-processLars Schneider2016-12-181-16/+1
| * | docs: warn about possible '=' in clean/smudge filter process valuesLars Schneider2016-12-064-15/+25
* | | Merge branch 'kh/tutorial-grammofix' into maintJunio C Hamano2017-01-171-6/+6
|\ \ \
| * | | doc: omit needless "for"kh/tutorial-grammofixKristoffer Haugsbakk2016-12-091-1/+1
| * | | doc: make the intent of sentence clearerKristoffer Haugsbakk2016-12-091-1/+1
| * | | doc: add verb in front of command to runKristoffer Haugsbakk2016-12-091-1/+1
| * | | doc: add articles (grammar)Kristoffer Haugsbakk2016-12-091-3/+3
* | | | Merge branch 'lr/doc-fix-cet' into maintJunio C Hamano2017-01-171-1/+1
|\ \ \ \
| * | | | date-formats.txt: Typo fixlr/doc-fix-cetLuis Ressel2016-12-121-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'sb/t3600-cleanup' into maintJunio C Hamano2017-01-171-73/+51
|\ \ \ \
| * | | | t3600: slightly modernize stylesb/t3600-cleanupStefan Beller2016-12-121-73/+51
| * | | | t3600: remove useless redirectStefan Beller2016-12-051-1/+1
* | | | | Merge branch 'jk/readme-gmane-is-no-more' into maintJunio C Hamano2017-01-171-1/+1
|\ \ \ \ \
| * | | | | README: replace gmane link with public-inboxjk/readme-gmane-is-no-moreJeff King2016-12-151-1/+1
| | |_|/ / | |/| | |
* | | | | Merge branch 'sb/unpack-trees-grammofix' into maintJunio C Hamano2017-01-172-2/+2
|\ \ \ \ \
| * | | | | unpack-trees: fix grammar for untracked files in directoriessb/unpack-trees-grammofixStefan Beller2016-12-052-2/+2
* | | | | | 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
View Lorry Controller Status