summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/am-3-nonstandard-popt'Junio C Hamano2012-03-041-0/+15
|\
| * test: "am -3" can accept non-standard -p<num>jc/am-3-nonstandard-poptJunio C Hamano2012-02-261-0/+15
* | Merge branch 'maint'Junio C Hamano2012-03-043-28/+13
|\ \
| * \ Merge branch 'cn/maint-branch-with-bad' into maintJunio C Hamano2012-03-041-0/+4
| |\ \
| * \ \ Merge branch 'jn/maint-gitweb-invalid-regexp' into maintJunio C Hamano2012-03-041-0/+10
| |\ \ \
| * \ \ \ Merge branch 'jk/maint-avoid-streaming-filtered-contents' into maintJunio C Hamano2012-03-041-0/+86
| |\ \ \ \
| * \ \ \ \ Merge branch 'tr/maint-bundle-long-subject' into maintJunio C Hamano2012-03-041-24/+23
| |\ \ \ \ \
| * | | | | | t0300: work around bug in dash 0.5.6Michael J Gruber2012-03-021-1/+4
| * | | | | | t5512 (ls-remote): modernize styleTom Grennan2012-03-021-23/+4
| * | | | | | tests: fix spurious error when run directly with Solaris /usr/xpg4/bin/shStefano Lattarini2012-03-021-4/+5
| * | | | | | Merge branch 'jn/gitweb-unborn-head' into maintJunio C Hamano2012-02-271-0/+9
| |\ \ \ \ \ \
* | | | | | | | parse-options: typo check for unknown switchesRené Scharfe2012-03-041-0/+10
* | | | | | | | Merge branch 'cb/fsck-squelch-dangling'Junio C Hamano2012-03-011-5/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | fsck: --no-dangling omits "dangling object" informationcb/fsck-squelch-danglingJunio C Hamano2012-02-281-5/+1
* | | | | | | | | Merge branch 'rs/no-no-no-parseopt'Junio C Hamano2012-03-011-2/+58
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | parse-options: allow positivation of options starting, with no-René Scharfe2012-02-261-1/+1
| * | | | | | | | | test-parse-options: convert to OPT_BOOL()René Scharfe2012-02-261-2/+58
* | | | | | | | | | Merge branch 'jn/maint-gitweb-invalid-regexp'Junio C Hamano2012-03-011-0/+10
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | gitweb: Handle invalid regexp in regexp searchjn/maint-gitweb-invalid-regexpJakub Narebski2012-02-281-0/+10
* | | | | | | | | | Merge branch 'cn/maint-branch-with-bad'Junio C Hamano2012-03-011-0/+4
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | branch: don't assume the merge filter ref existscn/maint-branch-with-badCarlos Martín Nieto2012-02-271-0/+4
* | | | | | | | | | Merge branch 'ph/cherry-pick-advice-refinement'Junio C Hamano2012-02-281-0/+14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | cherry-pick: No advice to commit if --no-commitph/cherry-pick-advice-refinementPhil Hord2012-02-221-0/+14
* | | | | | | | | | | Merge branch 'jb/required-filter'Junio C Hamano2012-02-281-0/+37
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add a setting to require a filter to be successfuljb/required-filterJehan Bing2012-02-171-0/+37
* | | | | | | | | | | | git-p4: missing she-bang line in t9804 confuses proveZbigniew Jędrzejewski-Szmek2012-02-271-0/+2
* | | | | | | | | | | | grep -P: add tests for matching ^ and $Michał Kiedrowicz2012-02-271-0/+23
* | | | | | | | | | | | Merge branch 'tr/maint-bundle-long-subject'Junio C Hamano2012-02-261-24/+23
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
| * | | | | | | | | | | t5704: match tests to modern styletr/maint-bundle-long-subjectThomas Rast2012-02-231-25/+8
| * | | | | | | | | | | bundle: use a strbuf to scan the log for boundary commitsThomas Rast2012-02-231-0/+16
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'fc/push-prune'Junio C Hamano2012-02-261-0/+16
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | push: add '--prune' optionfc/push-pruneFelipe Contreras2012-02-221-0/+16
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jk/maint-avoid-streaming-filtered-contents'Junio C Hamano2012-02-261-0/+86
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | do not stream large files to pack when filters are in usejk/maint-avoid-streaming-filtered-contentsJeff King2012-02-241-0/+86
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'maint'Junio C Hamano2012-02-263-21/+174
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | / / | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | Merge branch 'jc/add-refresh-unmerged' into maintJunio C Hamano2012-02-261-0/+15
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Sync with 1.7.8.5Junio C Hamano2012-02-261-0/+10
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | |
| | * | | | | | | | am: don't infloop for an empty input fileJim Meyering2012-02-261-0/+10
| | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | git-p4: remove bash-ism in t9800Pete Wyckoff2012-02-261-9/+15
| * | | | | | | | git-p4: remove bash-ism in t9809Pete Wyckoff2012-02-261-1/+1
| * | | | | | | | git-p4: fix submit regression with clientSpec and subdir clonePete Wyckoff2012-02-261-11/+131
| * | | | | | | | git-p4: set useClientSpec variable on initial clonePete Wyckoff2012-02-261-0/+17
| * | | | | | | | Merge branch 'cb/receive-pack-keep-errors' into maintJunio C Hamano2012-02-211-4/+18
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'cb/transfer-no-progress' into maintJunio C Hamano2012-02-211-1/+2
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/git-dir-lookup' into maintJunio C Hamano2012-02-211-0/+100
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'cb/maint-rev-list-verify-object' into maintJunio C Hamano2012-02-211-0/+26
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cb/maint-t5541-make-server-port-portable' into maintJunio C Hamano2012-02-211-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/grep-binary-attribute' into maintJunio C Hamano2012-02-211-0/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/diffstat-gramnum' into maintJunio C Hamano2012-02-2164-109/+109
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ld/git-p4-expanded-keywords'Junio C Hamano2012-02-231-0/+388
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \