aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* mergetools: add vimdiff3 modeFelipe Contreras2014-04-22
* Git 1.9.2v1.9.2Junio C Hamano2014-04-09
* Merge branch 'jl/nor-or-nand-and' into maintJunio C Hamano2014-04-09
|\
| * code and test: fix misuses of "nor"Justin Lebar2014-03-31
| * comments: fix misuses of "nor"Justin Lebar2014-03-31
| * contrib: fix misuses of "nor"Justin Lebar2014-03-31
| * Documentation: fix misuses of "nor"Justin Lebar2014-03-31
* | Merge branch 'cn/fetch-prune-overlapping-destination' into maintJunio C Hamano2014-04-09
|\ \
| * | fetch: handle overlaping refspecs on --pruneCarlos Martín Nieto2014-03-26
| * | fetch: add a failing test for prunning with overlapping refspecsCarlos Martín Nieto2014-02-28
* | | Merge branch 'mh/update-ref-batch-create-fix' into maintJunio C Hamano2014-04-09
|\ \ \
| * | | update-ref: fail create operation over stdin if ref already existsAman Gupta2014-04-02
* | | | Merge branch 'jk/commit-dates-parsing-fix' into maintJunio C Hamano2014-04-09
|\ \ \ \
| * | | | t4212: loosen far-in-future test for AIXJeff King2014-04-01
| * | | | date: recognize bogus FreeBSD gmtime outputJeff King2014-04-01
* | | | | Merge branch 'jc/fix-diff-no-index-diff-opt-parse' into maintJunio C Hamano2014-04-09
|\ \ \ \ \
| * | | | | diff-no-index: correctly diagnose error return from diff_opt_parse()Junio C Hamano2014-03-31
| | |_|/ / | |/| | |
* | | | | Merge commit 'doc/http-backend: missing accent grave in literal mark-up'Junio C Hamano2014-04-09
|\ \ \ \ \
| * | | | | doc/http-backend: missing accent grave in literal mark-upThomas Ackermann2014-04-09
* | | | | | Update draft release notes to 1.9.2Junio C Hamano2014-04-08
* | | | | | Merge branch 'mm/status-porcelain-format-i18n-fix' into maintJunio C Hamano2014-04-08
|\ \ \ \ \ \
| * | | | | | status: disable translation when --porcelain is usedMatthieu Moy2014-03-26
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'bp/commit-p-editor' into maintJunio C Hamano2014-04-08
|\ \ \ \ \ \
| * | | | | | run-command: mark run_hook_with_custom_index as deprecatedBenoit Pierre2014-03-18
| * | | | | | merge hook tests: fix and update testsBenoit Pierre2014-03-18
| * | | | | | merge: fix GIT_EDITOR override for commit hookBenoit Pierre2014-03-18
| * | | | | | commit: fix patch hunk editing with "commit -p -m"Benoit Pierre2014-03-18
| * | | | | | test patch hunk editing with "commit -p -m"Benoit Pierre2014-03-18
| * | | | | | merge hook tests: use 'test_must_fail' instead of '!'Benoit Pierre2014-03-11
| * | | | | | merge hook tests: fix missing '&&' in testBenoit Pierre2014-03-11
| | |_|_|/ / | |/| | | |
* | | | | | Start preparing for 1.9.1Junio C Hamano2014-04-03
* | | | | | Merge branch 'jk/mv-submodules-fix' into maintJunio C Hamano2014-04-03
|\ \ \ \ \ \
| * | | | | | mv: prevent mismatched data when ignoring errors.brian m. carlson2014-03-17
| * | | | | | builtin/mv: fix out of bounds writeJohn Keeping2014-03-11
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'mh/remove-subtree-long-pathname-fix' into maintJunio C Hamano2014-04-03
|\ \ \ \ \ \
| * | | | | | entry.c: fix possible buffer overflow in remove_subtree()Michael Haggerty2014-03-13
| * | | | | | checkout_entry(): use the strbuf throughout the functionMichael Haggerty2014-03-13
* | | | | | | Merge branch 'jk/lib-terminal-lazy' into maintJunio C Hamano2014-04-03
|\ \ \ \ \ \ \
| * | | | | | | t/lib-terminal: make TTY a lazy prerequisiteJeff King2014-03-14
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'nd/index-pack-error-message' into maintJunio C Hamano2014-04-03
|\ \ \ \ \ \ \
| * | | | | | | index-pack: report error using the correct variableJunio C Hamano2014-03-17
| |/ / / / / /
* | | | | | | Merge branch 'us/printf-not-echo' into maintJunio C Hamano2014-04-03
|\ \ \ \ \ \ \
| * | | | | | | test-lib.sh: do not "echo" caller-supplied stringsUwe Storbeck2014-03-18
| * | | | | | | rebase -i: do not "echo" random user-supplied stringsUwe Storbeck2014-03-17
* | | | | | | | Merge branch 'rr/doc-merge-strategies' into maintJunio C Hamano2014-04-03
|\ \ \ \ \ \ \ \
| * | | | | | | | Documentation/merge-strategies: avoid hyphenated commandsRamkumar Ramachandra2014-03-17
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jk/shallow-update-fix' into maintJunio C Hamano2014-04-03
|\ \ \ \ \ \ \ \
| * | | | | | | | shallow: verify shallow file after taking lockJeff King2014-03-17
| * | | | | | | | shallow: automatically clean up shallow tempfilesJeff King2014-02-27
| * | | | | | | | shallow: use stat_validity to check for up-to-date fileJeff King2014-02-27
| | |_|_|/ / / / | |/| | | | | |