summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* index-pack: distinguish missing objects from type errorsjk/index-pack-report-missingJeff King2014-05-121-2/+7
* Git 1.9.3v1.9.3Junio C Hamano2014-05-092-2/+3
* shell doc: remove stray "+" in exampleJonathan Nieder2014-05-081-1/+1
* Start preparing for 1.9.3Junio C Hamano2014-05-082-1/+22
* Merge branch 'cl/p4-use-diff-tree' into maintJunio C Hamano2014-05-081-1/+1
|\
| * git-p4: format-patch to diff-tree change breaks binary patchescl/p4-use-diff-treeTolga Ceylan2014-05-071-1/+1
* | Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname' into maintJunio C Hamano2014-05-082-24/+54
|\ \
| * | git-prompt.sh: don't put unsanitized branch names in $PS1Richard Hansen2014-04-222-24/+54
* | | Merge branch 'km/avoid-non-function-return-in-rebase' into maintJunio C Hamano2014-05-084-10/+46
|\ \ \
| * | | Revert "rebase: fix run_specific_rebase's use of "return" on FreeBSD"km/avoid-non-function-return-in-rebaseKyle J. McKay2014-04-171-10/+1
| * | | rebase: avoid non-function use of "return" on FreeBSDKyle J. McKay2014-04-173-0/+45
* | | | Merge branch 'tb/unicode-6.3-zero-width' into maintJunio C Hamano2014-05-081-5/+4
|\ \ \ \
| * | | | utf8.c: partially update to version 6.3Torsten Bögershausen2014-04-091-5/+4
* | | | | Merge branch 'km/avoid-bs-in-shell-glob' into maintJunio C Hamano2014-05-081-2/+2
|\ \ \ \ \
| * | | | | test: fix t5560 on FreeBSDkm/avoid-bs-in-shell-globKyle J. McKay2014-04-111-2/+2
| | |_|/ / | |/| | |
* | | | | Merge branch 'km/avoid-cp-a' into maintJunio C Hamano2014-05-081-2/+2
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | test: fix t7001 cp to use POSIX optionskm/avoid-cp-aKyle J. McKay2014-04-111-2/+2
| |/ / /
* | | | 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
| | |/ / / / / | |/| | | | |