summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bw/cp-a-is-gnuism' into maintJunio C Hamano2012-10-173-3/+3
|\
| * tests: "cp -a" is a GNUismBen Walton2012-10-083-3/+3
* | Merge branch 'jc/maint-t1450-fsck-order-fix' into maintJunio C Hamano2012-10-171-3/+1
|\ \
| * | t1450: the order the objects are checked is undefinedJunio C Hamano2012-10-021-3/+1
* | | Merge branch 'rr/test-use-shell-path-not-shell' into maintJunio C Hamano2012-10-171-16/+16
|\ \ \
| * | | test-lib: use $SHELL_PATH, not $SHELLRamkumar Ramachandra2012-09-251-16/+16
* | | | Merge branch 'rr/test-make-sure-we-have-git' into maintJunio C Hamano2012-10-172-10/+9
|\ \ \ \
| * | | | t/test-lib: make sure Git has already been builtRamkumar Ramachandra2012-09-182-10/+9
* | | | | Merge branch 'jc/ll-merge-binary-ours' into maintJunio C Hamano2012-10-171-1/+13
|\ \ \ \ \
| * | | | | attr: "binary" attribute should choose built-in "binary" merge driverJunio C Hamano2012-09-081-1/+1
| * | | | | merge: teach -Xours/-Xtheirs to binary ll-merge driverJunio C Hamano2012-09-081-1/+13
* | | | | | Merge branch 'jk/receive-pack-unpack-error-to-pusher' into maintJunio C Hamano2012-10-081-1/+1
|\ \ \ \ \ \
| * | | | | | receive-pack: drop "n/a" on unpacker errorsJeff King2012-09-211-1/+1
* | | | | | | Merge branch 'rt/maint-clone-single' into maintJunio C Hamano2012-10-081-0/+156
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | clone --single: limit the fetch refspec to fetched branchRalf Thielow2012-09-201-0/+156
* | | | | | | Merge branch 'rr/maint-submodule-unknown-cmd' into maintJunio C Hamano2012-10-021-2/+2
|\ \ \ \ \ \ \
| * | | | | | | submodule: if $command was not matched, don't parse other argsRamkumar Ramachandra2012-09-251-2/+2
* | | | | | | | Merge branch 'sp/maint-http-enable-gzip' into maintJunio C Hamano2012-10-021-1/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Enable info/refs gzip decompression in HTTP clientShawn O. Pearce2012-09-201-1/+2
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'jc/maint-log-grep-all-match-1' into maintJunio C Hamano2012-09-291-14/+76
|\ \ \ \ \ \ \ \
| * | | | | | | | t7810-grep: test --all-match with multiple --grep and --author optionsMichael J Gruber2012-09-151-0/+20
| * | | | | | | | t7810-grep: test interaction of multiple --grep and --author optionsMichael J Gruber2012-09-151-16/+22
| * | | | | | | | t7810-grep: test multiple --author with --all-matchMichael J Gruber2012-09-151-0/+8
| * | | | | | | | t7810-grep: test multiple --grep with and without --all-matchMichael J Gruber2012-09-151-0/+16
| * | | | | | | | t7810-grep: bring log --grep tests in common formMichael J Gruber2012-09-151-6/+18
* | | | | | | | | Merge branch 'jc/maint-mailinfo-mime-attr' into maintJunio C Hamano2012-09-295-1/+30
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | mailinfo: do not concatenate charset= attribute values from mime headersJunio C Hamano2012-09-175-1/+30
| |/ / / / / / / /
* | | | | | | | | Merge branch 'jc/maint-blame-no-such-path' into maintJunio C Hamano2012-09-241-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | blame: allow "blame file" in the middle of a conflicted mergeJunio C Hamano2012-09-111-1/+1
| * | | | | | | | | blame $path: avoid getting fooled by case insensitive filesystemsJunio C Hamano2012-09-101-2/+2
| |/ / / / / / / /
* | | | | | | | | Merge branch 'dj/fetch-all-tags' into maintJunio C Hamano2012-09-241-0/+30
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | fetch --all: pass --tags/--no-tags through to each remoteDan Johnson2012-09-071-0/+30
* | | | | | | | | Merge branch 'nd/maint-remote-remove' into maintJunio C Hamano2012-09-202-3/+3
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | remote: prefer subcommand name 'remove' to 'rm'Nguyễn Thái Ngọc Duy2012-09-062-3/+3
* | | | | | | | | t/perf: add "trash directory" to .gitignoreRamkumar Ramachandra2012-09-171-2/+3
* | | | | | | | | Merge branch 'mz/cherry-pick-cmdline-order' into maintJunio C Hamano2012-09-142-0/+25
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | cherry-pick/revert: respect order of revisions to pickMartin von Zweigbergk2012-08-301-1/+1
| * | | | | | | | | demonstrate broken 'git cherry-pick three one two'Martin von Zweigbergk2012-08-301-0/+15
| * | | | | | | | | teach log --no-walk=unsorted, which avoids sortingMartin von Zweigbergk2012-08-301-0/+10
* | | | | | | | | | Sync with 1.7.11.7Junio C Hamano2012-09-142-0/+17
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'jk/maint-quiet-is-synonym-to-s-in-log' into maint-1.7.11Junio C Hamano2012-09-141-0/+12
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | log: fix --quiet synonym for -sJeff King2012-08-281-0/+12
| * | | | | | | | | | Merge branch 'rj/test-regex' into maint-1.7.11Junio C Hamano2012-09-141-0/+5
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
| | * | | | | | | | | test-regex: Add a test to check for a bug in the regex routinesRamsay Jones2012-09-021-0/+5
| | | |_|_|_|_|/ / / | | |/| | | | | | |
* | | | | | | | | | Merge branch 'maint-1.7.11' into maintJunio C Hamano2012-09-1210-96/+191
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge branch 'jc/apply-binary-p0' into maint-1.7.11Junio C Hamano2012-09-121-21/+33
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | apply: compute patch->def_name correctly under -p0Junio C Hamano2012-08-241-21/+33
| * | | | | | | | | | Merge branch 'jc/dotdot-is-parent-directory' into maint-1.7.11Junio C Hamano2012-09-122-0/+21
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | specifying ranges: we did not mean to make ".." an empty setJunio C Hamano2012-08-232-0/+21
| * | | | | | | | | | | Merge branch 'jk/maint-http-half-auth-push' into maint-1.7.11Junio C Hamano2012-09-126-75/+127
| |\ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status