summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* log-tree: use FLEX_ARRAY in name_decorationjk/name-decoration-allocJeff King2014-08-272-2/+2
* log-tree: make name_decoration hash staticJeff King2014-08-263-5/+10
* log-tree: make add_name_decoration a public functionJeff King2014-08-263-14/+17
* Merge branch 'maint-1.8.5' into maint-1.9Junio C Hamano2014-07-221-1/+1
|\
| * Documentation: fix missing text for rev-parse --verifybrian m. carlson2014-07-221-1/+1
* | Merge branch 'maint-1.8.5' into maint-1.9Junio C Hamano2014-07-164-11/+9
|\ \ | |/
| * annotate: use argv_arrayRené Scharfe2014-07-161-7/+5
| * t7300: repair filesystem permissions with test_when_finishedJeff King2014-07-021-2/+2
| * enums: remove trailing ',' after last item in enumRonnie Sahlberg2014-07-022-2/+2
* | Git 1.9.4v1.9.4Junio C Hamano2014-05-304-3/+20
* | Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname' into maintJunio C Hamano2014-05-282-20/+42
|\ \
| * | git-prompt.sh: don't assume the shell expands the value of PS1rh/prompt-pcmode-avoid-eval-on-refnameRichard Hansen2014-05-192-20/+42
* | | Merge branch 'mw/symlinks' into maintJunio C Hamano2014-05-283-20/+112
|\ \ \
| * | | setup: fix windows path buffer over-steppingmw/symlinksMartin Erik Werner2014-04-241-2/+2
| * | | setup: don't dereference in-tree symlinks for absolute pathsMartin Erik Werner2014-02-043-22/+12
| * | | setup: add abspath_part_inside_repo() functionMartin Erik Werner2014-02-041-0/+64
| * | | t0060: add tests for prefix_path when path begins with work treeMartin Erik Werner2014-02-041-0/+10
| * | | t0060: add test for prefix_path when path == work treeMartin Erik Werner2014-02-041-0/+6
| * | | t0060: add test for prefix_path on symlinks via absolute pathsMartin Erik Werner2014-02-041-0/+5
| * | | t3004: add test for ls-files on symlinks via absolute pathsJunio C Hamano2014-02-041-0/+17
* | | | 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
View Lorry Controller Status