summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* mergetools: add vimdiff3 modefc/mergetools-vimdiff3Felipe Contreras2014-04-223-2/+14
* Git 1.9.2v1.9.2Junio C Hamano2014-04-093-2/+23
* Merge branch 'jl/nor-or-nand-and' into maintJunio C Hamano2014-04-0957-90/+88
|\
| * code and test: fix misuses of "nor"jl/nor-or-nand-andJustin Lebar2014-03-3112-16/+16
| * comments: fix misuses of "nor"Justin Lebar2014-03-3120-27/+26
| * contrib: fix misuses of "nor"Justin Lebar2014-03-312-3/+3
| * Documentation: fix misuses of "nor"Justin Lebar2014-03-3125-44/+43
* | Merge branch 'cn/fetch-prune-overlapping-destination' into maintJunio C Hamano2014-04-092-6/+64
|\ \
| * | fetch: handle overlaping refspecs on --prunecn/fetch-prune-overlapping-destinationCarlos Martín Nieto2014-03-262-7/+45
| * | fetch: add a failing test for prunning with overlapping refspecsCarlos Martín Nieto2014-02-281-0/+20
* | | Merge branch 'mh/update-ref-batch-create-fix' into maintJunio C Hamano2014-04-092-0/+12
|\ \ \
| * | | update-ref: fail create operation over stdin if ref already existsmh/update-ref-batch-create-fixAman Gupta2014-04-022-0/+12
* | | | Merge branch 'jk/commit-dates-parsing-fix' into maintJunio C Hamano2014-04-095-4/+47
|\ \ \ \
| * | | | t4212: loosen far-in-future test for AIXjk/commit-dates-parsing-fixJeff King2014-04-011-4/+2
| * | | | date: recognize bogus FreeBSD gmtime outputJeff King2014-04-014-0/+45
* | | | | Merge branch 'jc/fix-diff-no-index-diff-opt-parse' into maintJunio C Hamano2014-04-091-1/+1
|\ \ \ \ \
| * | | | | diff-no-index: correctly diagnose error return from diff_opt_parse()jc/fix-diff-no-index-diff-opt-parseJunio C Hamano2014-03-311-1/+1
| | |_|/ / | |/| | |
* | | | | Merge commit 'doc/http-backend: missing accent grave in literal mark-up'Junio C Hamano2014-04-091-1/+1
|\ \ \ \ \
| * | | | | doc/http-backend: missing accent grave in literal mark-upThomas Ackermann2014-04-091-1/+1
* | | | | | Update draft release notes to 1.9.2Junio C Hamano2014-04-081-0/+9
* | | | | | Merge branch 'mm/status-porcelain-format-i18n-fix' into maintJunio C Hamano2014-04-082-5/+9
|\ \ \ \ \ \
| * | | | | | status: disable translation when --porcelain is usedmm/status-porcelain-format-i18n-fixMatthieu Moy2014-03-262-5/+9
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'bp/commit-p-editor' into maintJunio C Hamano2014-04-0810-39/+137
|\ \ \ \ \ \
| * | | | | | run-command: mark run_hook_with_custom_index as deprecatedbp/commit-p-editorBenoit Pierre2014-03-181-0/+1
| * | | | | | merge hook tests: fix and update testsBenoit Pierre2014-03-181-6/+21
| * | | | | | merge: fix GIT_EDITOR override for commit hookBenoit Pierre2014-03-181-1/+1
| * | | | | | commit: fix patch hunk editing with "commit -p -m"Benoit Pierre2014-03-189-32/+80
| * | | | | | test patch hunk editing with "commit -p -m"Benoit Pierre2014-03-181-0/+34
| * | | | | | merge hook tests: use 'test_must_fail' instead of '!'Benoit Pierre2014-03-111-2/+2
| * | | | | | merge hook tests: fix missing '&&' in testBenoit Pierre2014-03-111-1/+1
| | |_|_|/ / | |/| | | |
* | | | | | Start preparing for 1.9.1Junio C Hamano2014-04-032-1/+39
* | | | | | Merge branch 'jk/mv-submodules-fix' into maintJunio C Hamano2014-04-032-1/+21
|\ \ \ \ \ \
| * | | | | | mv: prevent mismatched data when ignoring errors.jk/mv-submodules-fixbrian m. carlson2014-03-172-1/+17
| * | | | | | builtin/mv: fix out of bounds writeJohn Keeping2014-03-111-0/+4
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'mh/remove-subtree-long-pathname-fix' into maintJunio C Hamano2014-04-031-32/+32
|\ \ \ \ \ \
| * | | | | | entry.c: fix possible buffer overflow in remove_subtree()mh/remove-subtree-long-pathname-fixMichael Haggerty2014-03-131-17/+17
| * | | | | | checkout_entry(): use the strbuf throughout the functionMichael Haggerty2014-03-131-16/+16
* | | | | | | Merge branch 'jk/lib-terminal-lazy' into maintJunio C Hamano2014-04-031-18/+19
|\ \ \ \ \ \ \
| * | | | | | | t/lib-terminal: make TTY a lazy prerequisitejk/lib-terminal-lazyJeff King2014-03-141-18/+19
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'nd/index-pack-error-message' into maintJunio C Hamano2014-04-031-2/+2
|\ \ \ \ \ \ \
| * | | | | | | index-pack: report error using the correct variablend/index-pack-error-messageJunio C Hamano2014-03-171-2/+2
| |/ / / / / /
* | | | | | | Merge branch 'us/printf-not-echo' into maintJunio C Hamano2014-04-032-3/+3
|\ \ \ \ \ \ \
| * | | | | | | test-lib.sh: do not "echo" caller-supplied stringsus/printf-not-echoUwe Storbeck2014-03-181-2/+2
| * | | | | | | rebase -i: do not "echo" random user-supplied stringsUwe Storbeck2014-03-171-1/+1
* | | | | | | | Merge branch 'rr/doc-merge-strategies' into maintJunio C Hamano2014-04-031-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Documentation/merge-strategies: avoid hyphenated commandsrr/doc-merge-strategiesRamkumar Ramachandra2014-03-171-2/+2
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jk/shallow-update-fix' into maintJunio C Hamano2014-04-035-56/+49
|\ \ \ \ \ \ \ \
| * | | | | | | | shallow: verify shallow file after taking lockjk/shallow-update-fixJeff King2014-03-171-2/+2
| * | | | | | | | shallow: automatically clean up shallow tempfilesJeff King2014-02-275-37/+40
| * | | | | | | | shallow: use stat_validity to check for up-to-date fileJeff King2014-02-271-17/+7
| | |_|_|/ / / / | |/| | | | | |
View Lorry Controller Status