Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | i18n: rebase: mark messages for translation | Jiang Xin | 2012-07-25 | 3 | -9/+16 |
* | Merge branch 'tg/maint-cache-name-compare' | Junio C Hamano | 2012-07-15 | 1 | -0/+39 |
|\ | |||||
| * | cache_name_compare(): do not truncate while comparing paths | Junio C Hamano | 2012-07-11 | 1 | -0/+39 |
* | | Merge branch 'jk/maint-commit-amend-only-no-paths' | Junio C Hamano | 2012-07-15 | 1 | -0/+10 |
|\ \ | |||||
| * | | commit: fix "--amend --only" with no pathspec | Jeff King | 2012-07-10 | 1 | -0/+10 |
| |/ | |||||
* | | Merge branch 'cw/amend-commit-without-message' | Junio C Hamano | 2012-07-15 | 1 | -0/+15 |
|\ \ | |||||
| * | | Allow edit of empty message with commit --amend | Chris Webb | 2012-07-09 | 1 | -0/+15 |
* | | | Merge branch 'jc/apply-3way' | Junio C Hamano | 2012-07-15 | 2 | -0/+165 |
|\ \ \ | |||||
| * | | | apply: tests for the --3way option | Junio C Hamano | 2012-07-09 | 1 | -0/+54 |
| * | | | apply: allow rerere() to work on --3way results | Junio C Hamano | 2012-07-09 | 1 | -0/+25 |
| * | | | apply: register conflicted stages to the index | Junio C Hamano | 2012-07-09 | 1 | -0/+78 |
| * | | | apply: accept -3/--3way command line option | Junio C Hamano | 2012-07-09 | 1 | -0/+8 |
* | | | | Merge branch 'cw/rebase-i-root' | Junio C Hamano | 2012-07-15 | 2 | -5/+31 |
|\ \ \ \ | |||||
| * | | | | t3404: make test 57 work with dash and others | Michael J Gruber | 2012-07-05 | 1 | -1/+5 |
| * | | | | Add tests for rebase -i --root without --onto | Chris Webb | 2012-06-26 | 2 | -4/+27 |
* | | | | | Merge branch 'pw/git-p4-move' | Junio C Hamano | 2012-07-15 | 1 | -8/+8 |
|\ \ \ \ \ | |||||
| * | | | | | git p4: add support for 'p4 move' in P4Submit | Gary Gibbons | 2012-07-12 | 1 | -8/+8 |
* | | | | | | Merge branch 'pw/git-p4-jobs' | Junio C Hamano | 2012-07-13 | 3 | -5/+168 |
|\ \ \ \ \ \ | |||||
| * | | | | | | git p4: notice Jobs lines in git commit messages | Pete Wyckoff | 2012-07-05 | 1 | -0/+155 |
| * | | | | | | git p4 test: refactor marshal_dump | Pete Wyckoff | 2012-07-05 | 2 | -5/+13 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'jc/refactor-diff-stdin' | Junio C Hamano | 2012-07-13 | 1 | -0/+12 |
|\ \ \ \ \ \ | |||||
| * | | | | | | diff-index.c: "git diff" has no need to read blob from the standard input | Junio C Hamano | 2012-06-28 | 1 | -0/+12 |
* | | | | | | | Merge branch 'tb/sanitize-decomposed-utf-8-pathname' | Junio C Hamano | 2012-07-13 | 1 | -0/+164 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | git on Mac OS and precomposed unicode | Torsten Bögershausen | 2012-07-08 | 1 | -0/+164 |
* | | | | | | | | 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 |