summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* git-p4: clean up after p4 submit failureeg/p4-submit-catch-failureGIRARD Etienne2015-11-242-35/+38
* Merge branch 'js/gc-with-stale-symref' into maintJunio C Hamano2015-10-202-1/+20
|\
| * pack-objects: do not get distracted by broken symrefsjs/gc-with-stale-symrefJohannes Schindelin2015-10-082-2/+8
| * gc: demonstrate failure with stale remote HEADJohannes Schindelin2015-10-051-0/+13
* | Merge branch 'rd/test-path-utils' into maintJunio C Hamano2015-10-202-2/+5
|\ \
| * | test-path-utils.c: remove incorrect assumptionrd/test-path-utilsRay Donnelly2015-10-082-2/+5
* | | Merge branch 'jc/doc-gc-prune-now' into maintJunio C Hamano2015-10-201-2/+5
|\ \ \
| * | | Documentation/gc: warn against --prune=<now>jc/doc-gc-prune-nowJunio C Hamano2015-10-141-2/+5
* | | | Merge branch 'jk/filter-branch-use-of-sed-on-incomplete-line' into maintJunio C Hamano2015-10-202-1/+15
|\ \ \ \
| * | | | filter-branch: remove multi-line headers in msg filterjk/filter-branch-use-of-sed-on-incomplete-lineJames McCoy2015-10-122-1/+15
* | | | | Merge branch 'maint' of git://github.com/git-l10n/git-po into maintJunio C Hamano2015-10-181-1583/+1967
|\ \ \ \ \
| * | | | | l10n: ru.po: update Russian translationDimitriy Ryazantcev2015-09-301-1583/+1967
* | | | | | Git 2.6.2v2.6.2Junio C Hamano2015-10-164-3/+69
* | | | | | Merge branch 'cc/quote-comments' into maintJunio C Hamano2015-10-161-5/+6
|\ \ \ \ \ \
| * | | | | | quote: move comment before sq_quote_buf()cc/quote-commentsChristian Couder2015-10-071-5/+5
| * | | | | | quote: fix broken sq_quote_buf() related commentChristian Couder2015-10-071-0/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'es/worktree-add-cleanup' into maintJunio C Hamano2015-10-161-0/+0
|\ \ \ \ \ \
| * | | | | | t2026: rename worktree prune testes/worktree-add-cleanupMichael J Gruber2015-10-071-0/+0
* | | | | | | Merge branch 'tk/doc-interpret-trailers-grammo' into maintJunio C Hamano2015-10-161-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Documentation/interpret-trailers: Grammar fixtk/doc-interpret-trailers-grammoTobias Klauser2015-10-071-1/+1
* | | | | | | | Merge branch 'tk/typofix-connect-unknown-proto-error' into maintJunio C Hamano2015-10-161-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | connect: fix typo in result string of prot_name()tk/typofix-connect-unknown-proto-errorTobias Klauser2015-09-251-1/+1
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | 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