summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/asciidoctor-section-heading-markup-fix' into maintJunio C Hamano2015-10-162-2/+2
|\
| * Documentation: fix section header mark-upjk/asciidoctor-section-heading-markup-fixJohn Keeping2015-09-252-2/+2
* | Merge branch 'nd/ls-remote-does-not-have-u-option' into maintJunio C Hamano2015-10-162-3/+2
|\ \
| * | ls-remote.txt: delete unsupported optionnd/ls-remote-does-not-have-u-optionNguyễn Thái Ngọc Duy2015-09-282-3/+2
* | | Merge branch 'jc/fsck-dropped-errors' into maintJunio C Hamano2015-10-162-5/+35
|\ \ \
| * | | fsck: exit with non-zero when problems are foundjc/fsck-dropped-errorsJunio C Hamano2015-09-232-5/+35
* | | | Merge branch 'sb/http-flaky-test-fix' into maintJunio C Hamano2015-10-163-23/+1
|\ \ \ \
| * | | | t5561: get rid of racy appending to logfilesb/http-flaky-test-fixStephan Beyer2015-09-253-23/+1
* | | | | Merge branch 'sb/perf-without-installed-git' into maintJunio C Hamano2015-10-161-0/+1
|\ \ \ \ \
| * | | | | t/perf: make runner work even if Git is not installedsb/perf-without-installed-gitStephan Beyer2015-09-251-0/+1
* | | | | | Merge branch 'js/icase-wt-detection' into maintJunio C Hamano2015-10-161-1/+10
|\ \ \ \ \ \
| * | | | | | setup: fix "inside work tree" detection on case-insensitive filesystemsjs/icase-wt-detectionJohannes Schindelin2015-09-281-1/+10
| |/ / / / /
* | | | | | Merge branch 'pt/am-builtin' into maintJunio C Hamano2015-10-161-1/+12
|\ \ \ \ \ \
| * | | | | | am: configure gpg at startuppt/am-builtinRenee Margaret McConahy2015-09-301-1/+12
* | | | | | | Merge branch 'mm/detach-at-HEAD-reflog' into maintJunio C Hamano2015-10-162-0/+19
|\ \ \ \ \ \ \
| * | | | | | | status: don't say 'HEAD detached at HEAD'mm/detach-at-HEAD-reflogMatthieu Moy2015-10-022-1/+7
| * | | | | | | t3203: test 'detached at' after checkout --detachMatthieu Moy2015-10-021-0/+13
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'gr/rebase-i-drop-warn' into maintJunio C Hamano2015-10-162-35/+46
|\ \ \ \ \ \ \
| * | | | | | | rebase-i: loosen over-eager check_bad_cmd checkMatthieu Moy2015-10-052-33/+44
| * | | | | | | rebase-i: explicitly accept tab as separator in commandsMatthieu Moy2015-10-021-2/+2
* | | | | | | | Merge branch 'dt/log-follow-config' into maintJunio C Hamano2015-10-162-4/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | log: Update log.follow doc and add to config.txtdt/log-follow-configEric N. Vander Weele2015-10-072-4/+10
* | | | | | | | | Merge branch 'ti/glibc-stdio-mutex-from-signal-handler' into maintJunio C Hamano2015-10-163-14/+34
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | pager: don't use unsafe functions in signal handlersti/glibc-stdio-mutex-from-signal-handlerTakashi Iwai2015-09-043-14/+34
* | | | | | | | | | Merge branch 'jk/notes-dwim-doc' into maintJunio C Hamano2015-10-163-3/+12
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | notes: correct documentation of DWIMery for notes referencesjk/notes-dwim-docJacob Keller2015-09-223-3/+12
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jk/make-findstring-makeflags-fix' into maintJunio C Hamano2015-10-161-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Makefile: fix MAKEFLAGS tests with multiple flagsjk/make-findstring-makeflags-fixJohn Keeping2015-09-101-2/+2
* | | | | | | | | | | Merge branch 'jw/make-arflags-customizable' into maintJunio C Hamano2015-10-161-3/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Makefile: allow $(ARFLAGS) specified from the command linejw/make-arflags-customizableJunio C Hamano2015-09-101-3/+6
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jk/connect-clear-env' into maintJunio C Hamano2015-10-162-10/+49
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | git_connect: clarify conn->use_shell flagjk/connect-clear-envJeff King2015-09-081-9/+13
| * | | | | | | | | | | git_connect: clear GIT_* environment for sshJeff King2015-09-042-2/+36
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jk/blame-first-parent' into maintJunio C Hamano2015-10-162-1/+14
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | blame: handle --first-parentjk/blame-first-parentJeff King2015-09-162-1/+14
* | | | | | | | | | | | Merge branch 'mm/keyid-docs' into maintJunio C Hamano2015-10-1610-29/+47
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Documentation: explain optional arguments bettermm/keyid-docsMatthieu Moy2015-09-219-10/+28
| * | | | | | | | | | | | Documentation/grep: fix documentation of -OMatthieu Moy2015-09-211-2/+2
| * | | | | | | | | | | | Documentation: use 'keyid' consistently, not 'key-id'Matthieu Moy2015-09-215-17/+17
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'pt/pull-builtin' into maintJunio C Hamano2015-10-163-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | pull: enclose <options> in brackets in the usage stringpt/pull-builtinAlex Henrie2015-10-161-1/+1
| * | | | | | | | | | | | merge: grammofix in please-commit-before-merge messageAlex Henrie2015-10-022-2/+2
* | | | | | | | | | | | | Git 2.6.1v2.6.1Junio C Hamano2015-09-284-3/+22
* | | | | | | | | | | | | Sync with v2.5.4Junio C Hamano2015-09-2829-30/+486
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Git 2.5.4v2.5.4Junio C Hamano2015-09-284-3/+22
| * | | | | | | | | | | | | Sync with 2.4.10Junio C Hamano2015-09-2828-29/+466
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Git 2.4.10v2.4.10Junio C Hamano2015-09-284-3/+22
| | * | | | | | | | | | | | Sync with 2.3.10Junio C Hamano2015-09-2827-28/+446
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | Git 2.3.10v2.3.10maint-2.3Junio C Hamano2015-09-284-3/+22
| | | * | | | | | | | | | | Merge branch 'jk/xdiff-memory-limits' into maint-2.3Junio C Hamano2015-09-2811-26/+57
| | | |\ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status