Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'bw/cp-a-is-gnuism' into maint | Junio C Hamano | 2012-10-17 |
|\ | |||
| * | tests: "cp -a" is a GNUism | Ben Walton | 2012-10-08 |
* | | Merge branch 'jc/maint-t1450-fsck-order-fix' into maint | Junio C Hamano | 2012-10-17 |
|\ \ | |||
| * | | t1450: the order the objects are checked is undefined | Junio C Hamano | 2012-10-02 |
* | | | Merge branch 'rr/test-use-shell-path-not-shell' into maint | Junio C Hamano | 2012-10-17 |
|\ \ \ | |||
| * | | | test-lib: use $SHELL_PATH, not $SHELL | Ramkumar Ramachandra | 2012-09-25 |
* | | | | Merge branch 'rr/test-make-sure-we-have-git' into maint | Junio C Hamano | 2012-10-17 |
|\ \ \ \ | |||
| * | | | | t/test-lib: make sure Git has already been built | Ramkumar Ramachandra | 2012-09-18 |
* | | | | | Merge branch 'jc/ll-merge-binary-ours' into maint | Junio C Hamano | 2012-10-17 |
|\ \ \ \ \ | |||
| * | | | | | attr: "binary" attribute should choose built-in "binary" merge driver | Junio C Hamano | 2012-09-08 |
| * | | | | | merge: teach -Xours/-Xtheirs to binary ll-merge driver | Junio C Hamano | 2012-09-08 |
* | | | | | | Merge branch 'jk/receive-pack-unpack-error-to-pusher' into maint | Junio C Hamano | 2012-10-08 |
|\ \ \ \ \ \ | |||
| * | | | | | | receive-pack: drop "n/a" on unpacker errors | Jeff King | 2012-09-21 |
* | | | | | | | Merge branch 'rt/maint-clone-single' into maint | Junio C Hamano | 2012-10-08 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||
| * | | | | | | clone --single: limit the fetch refspec to fetched branch | Ralf Thielow | 2012-09-20 |
* | | | | | | | Merge branch 'rr/maint-submodule-unknown-cmd' into maint | Junio C Hamano | 2012-10-02 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | submodule: if $command was not matched, don't parse other args | Ramkumar Ramachandra | 2012-09-25 |
* | | | | | | | | Merge branch 'sp/maint-http-enable-gzip' into maint | Junio C Hamano | 2012-10-02 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | Enable info/refs gzip decompression in HTTP client | Shawn O. Pearce | 2012-09-20 |
| | |_|_|_|/ / / | |/| | | | | | | |||
* | | | | | | | | Merge branch 'jc/maint-log-grep-all-match-1' into maint | Junio C Hamano | 2012-09-29 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | t7810-grep: test --all-match with multiple --grep and --author options | Michael J Gruber | 2012-09-15 |
| * | | | | | | | | t7810-grep: test interaction of multiple --grep and --author options | Michael J Gruber | 2012-09-15 |
| * | | | | | | | | t7810-grep: test multiple --author with --all-match | Michael J Gruber | 2012-09-15 |
| * | | | | | | | | t7810-grep: test multiple --grep with and without --all-match | Michael J Gruber | 2012-09-15 |
| * | | | | | | | | t7810-grep: bring log --grep tests in common form | Michael J Gruber | 2012-09-15 |
* | | | | | | | | | Merge branch 'jc/maint-mailinfo-mime-attr' into maint | Junio C Hamano | 2012-09-29 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | mailinfo: do not concatenate charset= attribute values from mime headers | Junio C Hamano | 2012-09-17 |
| |/ / / / / / / / | |||
* | | | | | | | | | Merge branch 'jc/maint-blame-no-such-path' into maint | Junio C Hamano | 2012-09-24 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | blame: allow "blame file" in the middle of a conflicted merge | Junio C Hamano | 2012-09-11 |
| * | | | | | | | | | blame $path: avoid getting fooled by case insensitive filesystems | Junio C Hamano | 2012-09-10 |
| |/ / / / / / / / | |||
* | | | | | | | | | Merge branch 'dj/fetch-all-tags' into maint | Junio C Hamano | 2012-09-24 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | |||
| * | | | | | | | | fetch --all: pass --tags/--no-tags through to each remote | Dan Johnson | 2012-09-07 |
* | | | | | | | | | Merge branch 'nd/maint-remote-remove' into maint | Junio C Hamano | 2012-09-20 |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | |||
| * | | | | | | | | remote: prefer subcommand name 'remove' to 'rm' | Nguyễn Thái Ngọc Duy | 2012-09-06 |
* | | | | | | | | | t/perf: add "trash directory" to .gitignore | Ramkumar Ramachandra | 2012-09-17 |
* | | | | | | | | | Merge branch 'mz/cherry-pick-cmdline-order' into maint | Junio C Hamano | 2012-09-14 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | cherry-pick/revert: respect order of revisions to pick | Martin von Zweigbergk | 2012-08-30 |
| * | | | | | | | | | demonstrate broken 'git cherry-pick three one two' | Martin von Zweigbergk | 2012-08-30 |
| * | | | | | | | | | teach log --no-walk=unsorted, which avoids sorting | Martin von Zweigbergk | 2012-08-30 |
* | | | | | | | | | | Sync with 1.7.11.7 | Junio C Hamano | 2012-09-14 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | | |||
| * | | | | | | | | | Merge branch 'jk/maint-quiet-is-synonym-to-s-in-log' into maint-1.7.11 | Junio C Hamano | 2012-09-14 |
| |\ \ \ \ \ \ \ \ \ | |||
| | * | | | | | | | | | log: fix --quiet synonym for -s | Jeff King | 2012-08-28 |
| * | | | | | | | | | | Merge branch 'rj/test-regex' into maint-1.7.11 | Junio C Hamano | 2012-09-14 |
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | |||
| | * | | | | | | | | | test-regex: Add a test to check for a bug in the regex routines | Ramsay Jones | 2012-09-02 |
| | | |_|_|_|_|/ / / | | |/| | | | | | | | |||
* | | | | | | | | | | Merge branch 'maint-1.7.11' into maint | Junio C Hamano | 2012-09-12 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||
| * | | | | | | | | | Merge branch 'jc/apply-binary-p0' into maint-1.7.11 | Junio C Hamano | 2012-09-12 |
| |\ \ \ \ \ \ \ \ \ | |||
| | * | | | | | | | | | apply: compute patch->def_name correctly under -p0 | Junio C Hamano | 2012-08-24 |
| * | | | | | | | | | | Merge branch 'jc/dotdot-is-parent-directory' into maint-1.7.11 | Junio C Hamano | 2012-09-12 |
| |\ \ \ \ \ \ \ \ \ \ | |||
| | * | | | | | | | | | | specifying ranges: we did not mean to make ".." an empty set | Junio C Hamano | 2012-08-23 |
| * | | | | | | | | | | | Merge branch 'jk/maint-http-half-auth-push' into maint-1.7.11 | Junio C Hamano | 2012-09-12 |
| |\ \ \ \ \ \ \ \ \ \ \ |