Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'da/mergetool-custom' | Junio C Hamano | 2012-10-01 |
|\ | |||
| * | mergetool--lib: Allow custom commands to override built-ins | David Aguilar | 2012-09-25 |
* | | Merge branch 'jk/receive-pack-unpack-error-to-pusher' | Junio C Hamano | 2012-10-01 |
|\ \ | |||
| * | | receive-pack: drop "n/a" on unpacker errors | Jeff King | 2012-09-21 |
| * | | Merge branch 'nd/maint-remote-remove' into maint | Junio C Hamano | 2012-09-20 |
| |\ \ | |||
* | \ \ | Merge branch 'rt/maint-clone-single' | Junio C Hamano | 2012-10-01 |
|\ \ \ \ | |||
| * | | | | clone --single: limit the fetch refspec to fetched branch | Ralf Thielow | 2012-09-20 |
* | | | | | Merge branch 'rr/maint-submodule-unknown-cmd' | Junio C Hamano | 2012-09-29 |
|\ \ \ \ \ | |||
| * | | | | | submodule: if $command was not matched, don't parse other args | Ramkumar Ramachandra | 2012-09-25 |
* | | | | | | Merge branch 'jk/smart-http-switch' | Junio C Hamano | 2012-09-29 |
|\ \ \ \ \ \ | |||
| * | | | | | | remote-curl: let users turn off smart http | Jeff King | 2012-09-21 |
| | |_|/ / / | |/| | | | | |||
* | | | | | | Merge branch 'sp/maint-http-enable-gzip' | Junio C Hamano | 2012-09-29 |
|\ \ \ \ \ \ | |||
| * | | | | | | Enable info/refs gzip decompression in HTTP client | Shawn O. Pearce | 2012-09-20 |
| |/ / / / / | |||
* | | | | | | Merge branch 'aw/rebase-i-edit-todo' | Junio C Hamano | 2012-09-29 |
|\ \ \ \ \ \ | |||
| * | | | | | | rebase -i: Add tests for "--edit-todo" | Andrew Wong | 2012-09-17 |
* | | | | | | | Merge branch 'js/rebase-exec-command-not-found' | Junio C Hamano | 2012-09-29 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | rebase -i: fix misleading error message after 'exec no-such' instruction | Johannes Sixt | 2012-09-18 |
| | |/ / / / / | |/| | | | | | |||
* | | | | | | | Merge branch 'rr/test-use-shell-path-not-shell' | Junio C Hamano | 2012-09-29 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | test-lib: use $SHELL_PATH, not $SHELL | Ramkumar Ramachandra | 2012-09-25 |
| | |_|_|_|_|/ | |/| | | | | | |||
* | | | | | | | Merge branch 'rr/test-make-sure-we-have-git' | Junio C Hamano | 2012-09-25 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | t/test-lib: make sure Git has already been built | Ramkumar Ramachandra | 2012-09-18 |
| | |/ / / / / | |/| | | | | | |||
* | | | | | | | Merge branch 'ep/malloc-check-perturb' | Junio C Hamano | 2012-09-25 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | MALLOC_CHECK: various clean-ups | Junio C Hamano | 2012-09-17 |
| * | | | | | | | Add MALLOC_CHECK_ and MALLOC_PERTURB_ libc env to the test suite for detectin... | Elia Pinto | 2012-09-14 |
* | | | | | | | | Merge branch 'aj/xfuncname-ada' | Junio C Hamano | 2012-09-25 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | Add userdiff patterns for Ada | Adrian Johnson | 2012-09-16 |
| | |_|/ / / / / | |/| | | | | | | |||
* | | | | | | | | Merge branch 'jc/maint-mailinfo-mime-attr' | Junio C Hamano | 2012-09-25 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | mailinfo: do not concatenate charset= attribute values from mime headers | Junio C Hamano | 2012-09-17 |
* | | | | | | | | | Merge branch 'jc/maint-log-grep-all-match' | Junio C Hamano | 2012-09-18 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | 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 'pw/p4-submit-conflicts' | Junio C Hamano | 2012-09-18 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | git-p4: add submit --conflict option and config varaiable | Pete Wyckoff | 2012-09-16 |
| * | | | | | | | | | git p4: add submit --prepare-p4-only option | Pete Wyckoff | 2012-09-16 |
| * | | | | | | | | | git p4: add submit --dry-run option | Pete Wyckoff | 2012-09-16 |
| * | | | | | | | | | git p4: revert deleted files after submit cancel | Pete Wyckoff | 2012-09-16 |
| * | | | | | | | | | git p4: test clean-up after failed submit, fix added files | Pete Wyckoff | 2012-09-16 |
| * | | | | | | | | | git p4: standardize submit cancel due to unchanged template | Pete Wyckoff | 2012-09-16 |
| * | | | | | | | | | git p4: move conflict prompt into run, add [q]uit input | Pete Wyckoff | 2012-09-16 |
| * | | | | | | | | | git p4: gracefully fail if some commits could not be applied | Pete Wyckoff | 2012-09-16 |
| * | | | | | | | | | git p4 test: remove bash-ism of combined export/assignment | Pete Wyckoff | 2012-09-16 |
| | |/ / / / / / / | |/| | | | | | | | |||
* | | | | | | | | | Merge branch 'mv/cherry-pick-s' | Junio C Hamano | 2012-09-18 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | cherry-pick: don't forget -s on failure | Miklos Vajna | 2012-09-14 |
* | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2012-09-17 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | | |||
| * | | | | | | | | | 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 |
| |\ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ | Sync with 1.7.11.7 | Junio C Hamano | 2012-09-14 |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | | |