Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'tr/maint-show-walk' | Junio C Hamano | 2012-07-13 | 1 | -0/+91 |
|\ | |||||
| * | show: fix "range implies walking" | Junio C Hamano | 2012-06-19 | 1 | -2/+2 |
| * | Demonstrate git-show is broken with ranges | Thomas Rast | 2012-06-19 | 1 | -0/+91 |
* | | Merge branch 'mz/rebase-no-mbox' | Junio C Hamano | 2012-07-13 | 2 | -5/+35 |
|\ \ | |||||
| * | | am --rebasing: get patch body from commit, not from mailbox | Martin von Zweigbergk | 2012-06-26 | 1 | -4/+28 |
| * | | rebase --root: print usage on too many args | Martin von Zweigbergk | 2012-06-26 | 1 | -1/+7 |
* | | | Merge branch 'mz/empty-rebase-test' | Junio C Hamano | 2012-07-09 | 1 | -0/+8 |
|\ \ \ | |||||
| * | | | add test case for rebase of empty commit | Martin von Zweigbergk | 2012-06-27 | 1 | -0/+8 |
* | | | | Merge branch 'pw/git-p4-tests' | Junio C Hamano | 2012-07-09 | 9 | -433/+574 |
|\ \ \ \ | |||||
| * | | | | git p4 test: fix badp4dir test | Pete Wyckoff | 2012-06-27 | 1 | -3/+7 |
| * | | | | git p4 test: split up big t9800 test | Pete Wyckoff | 2012-06-27 | 4 | -397/+506 |
| * | | | | git p4 test: cleanup_git should make a new $git | Pete Wyckoff | 2012-06-27 | 3 | -2/+3 |
| * | | | | git p4 test: copy source indeterminate | Pete Wyckoff | 2012-06-27 | 1 | -2/+2 |
| * | | | | git p4 test: check for error message in failed test | Pete Wyckoff | 2012-06-27 | 1 | -1/+2 |
| * | | | | git p4 test: rename some "git-p4 command" strings | Pete Wyckoff | 2012-06-27 | 1 | -3/+3 |
| * | | | | git p4 test: never create default test repo | Pete Wyckoff | 2012-06-27 | 1 | -0/+4 |
| * | | | | git p4 test: simplify quoting involving TRASH_DIRECTORY | Pete Wyckoff | 2012-06-27 | 4 | -21/+17 |
| * | | | | git p4 test: use real_path to resolve p4 client symlinks | Pete Wyckoff | 2012-06-27 | 3 | -3/+3 |
| * | | | | git p4 test: wait longer for p4d to start and test its pid | Pete Wyckoff | 2012-06-27 | 1 | -6/+32 |
* | | | | | Merge branch 'js/fast-export-paths-with-spaces' | Junio C Hamano | 2012-07-09 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | fast-export: quote paths with spaces | Jay Soffian | 2012-06-27 | 1 | -1/+1 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'cw/no-detaching-an-unborn' | Junio C Hamano | 2012-07-09 | 1 | -0/+6 |
|\ \ \ \ \ | |||||
| * | | | | | git-checkout: disallow --detach on unborn branch | Chris Webb | 2012-06-26 | 1 | -0/+6 |
* | | | | | | Merge branch 'vr/use-our-perl-in-tests' | Junio C Hamano | 2012-07-09 | 26 | -44/+65 |
|\ \ \ \ \ \ | |||||
| * | | | | | | t/README: add a bit more Don'ts | Junio C Hamano | 2012-06-24 | 1 | -3/+22 |
| * | | | | | | tests: enclose $PERL_PATH in double quotes | Junio C Hamano | 2012-06-24 | 24 | -41/+41 |
| * | | | | | | t/test-lib.sh: export PERL_PATH for use in scripts | Junio C Hamano | 2012-06-24 | 1 | -0/+2 |
| * | | | | | | t: Replace 'perl' by $PERL_PATH | Vincent van Ravesteijn | 2012-06-12 | 24 | -41/+41 |
* | | | | | | | Merge branch 'mm/credential-plumbing' | Junio C Hamano | 2012-07-09 | 2 | -2/+51 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | git credential fill: output the whole 'struct credential' | Matthieu Moy | 2012-06-25 | 2 | -0/+39 |
| * | | | | | | | add 'git credential' plumbing command | Javier Roucher Iglesias | 2012-06-25 | 1 | -2/+12 |
* | | | | | | | | Merge branch 'mm/config-xdg' | Junio C Hamano | 2012-07-09 | 1 | -0/+158 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | config: write to $XDG_CONFIG_HOME/git/config file when appropriate | Huynh Khoi Nguyen Nguyen | 2012-06-25 | 1 | -0/+30 |
| * | | | | | | | | Let core.attributesfile default to $XDG_CONFIG_HOME/git/attributes | Huynh Khoi Nguyen Nguyen | 2012-06-25 | 1 | -0/+29 |
| * | | | | | | | | Let core.excludesfile default to $XDG_CONFIG_HOME/git/ignore | Huynh Khoi Nguyen Nguyen | 2012-06-25 | 1 | -0/+29 |
| * | | | | | | | | config: read (but not write) from $XDG_CONFIG_HOME/git/config file | Huynh Khoi Nguyen Nguyen | 2012-06-25 | 1 | -0/+70 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'nd/clone-single-fix' | Junio C Hamano | 2012-07-04 | 1 | -1/+6 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | clone: fix ref selection in --single-branch --branch=xxx | Nguyễn Thái Ngọc Duy | 2012-06-22 | 1 | -1/+6 |
* | | | | | | | | | Merge branch 'th/diff-no-index-fixes' | Junio C Hamano | 2012-07-04 | 2 | -2/+86 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | diff-no-index: exit(1) if 'diff --quiet <repo file> <external file>' finds ch... | Tim Henigan | 2012-06-22 | 1 | -1/+72 |
| * | | | | | | | | | diff: handle relative paths in no-index | Jeff King | 2012-06-22 | 1 | -1/+14 |
| |/ / / / / / / / | |||||
| * | | | | | | | | Merge branch 'ef/maint-rebase-error-message' into maint | Junio C Hamano | 2012-06-03 | 1 | -0/+5 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'rs/maint-grep-F' into maint | Junio C Hamano | 2012-06-01 | 1 | -0/+5 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jk/ident-split-fix' into maint | Junio C Hamano | 2012-06-01 | 1 | -0/+7 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'hv/submodule-alt-odb' into maint | Junio C Hamano | 2012-05-25 | 1 | -0/+34 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'bp/diff-no-index-strbuf-fix' into maint | Junio C Hamano | 2012-05-25 | 1 | -0/+19 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/maint-status-porcelain-z-b' into maint | Junio C Hamano | 2012-05-24 | 1 | -1/+15 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'hv/remote-end-hung-up' | Junio C Hamano | 2012-07-04 | 1 | -9/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | remove the impression of unexpectedness when access is denied | Heiko Voigt | 2012-06-19 | 1 | -9/+7 |
* | | | | | | | | | | | | | | | | Merge branch 'fc/git-prompt-script' | Junio C Hamano | 2012-06-28 | 3 | -13/+475 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |