| Commit message (Expand) | Author | Age |
* | Merge branch 'mb/rebase-i-no-ff' | Junio C Hamano | 2010-04-03 |
|\ |
|
| * | Teach rebase the --no-ff option. | Marc Branchaud | 2010-03-24 |
* | | Merge branch 'do/rebase-i-arbitrary' | Junio C Hamano | 2010-04-03 |
|\ \ |
|
| * | | rebase--interactive: don't require what's rebased to be a branch | Dave Olszewski | 2010-03-14 |
| |/ |
|
* | | rebase: support automatic notes copying | Thomas Rast | 2010-03-12 |
|/ |
|
* | rebase -i: Retain user-edited commit messages after squash/fixup conflicts | Michael Haggerty | 2010-01-14 |
* | t3404: Set up more of the test repo in the "setup" step | Michael Haggerty | 2010-01-14 |
* | rebase -i: For fixup commands without squashes, do not start editor | Michael Haggerty | 2010-01-14 |
* | rebase -i: Improve consistency of commit count in generated commit messages | Michael Haggerty | 2010-01-14 |
* | t3404: Test the commit count in commit messages generated by "rebase -i" | Michael Haggerty | 2010-01-14 |
* | rebase-i: Ignore comments and blank lines in peek_next_command | Michael Haggerty | 2010-01-12 |
* | Add a command "fixup" to rebase --interactive | Michael Haggerty | 2009-12-07 |
* | t3404: Use test_commit to set up test repository | Michael Haggerty | 2009-12-06 |
* | Teach 'rebase -i' the command "reword" | Björn Gustavsson | 2009-10-07 |
* | tests: use "$TEST_DIRECTORY" instead of ".." | Jeff King | 2009-08-09 |
* | Remove filename from conflict markers | Martin Renold | 2009-07-01 |
* | rebase -i: avoid 'git reset' when possible | Johannes Schindelin | 2009-03-03 |
* | Merge branch 'js/maint-rebase-i-submodule' | Junio C Hamano | 2009-01-31 |
|\ |
|
| * | Fix submodule squashing into unrelated commit | Johannes Schindelin | 2009-01-28 |
| * | rebase -i squashes submodule changes into unrelated commit | Junio C Hamano | 2009-01-28 |
* | | t3404 & t3411: undo copy&paste | Johannes Schindelin | 2009-01-28 |
|/ |
|
* | t3404: Add test case for auto-amending only edited commits after "edit" | Stephan Beyer | 2009-01-15 |
* | t3404: Add test case for aborted --continue after "edit" | Stephan Beyer | 2009-01-15 |
* | rebase -i: do not fail when there is no commit to cherry-pick | Johannes Schindelin | 2008-10-10 |
* | tests: use "git xyzzy" form (t0000 - t3599) | Nanako Shiraishi | 2008-09-03 |
* | rebase -i -p: fix parent rewriting | Thomas Rast | 2008-08-13 |
* | rebase -i -p: handle index and workdir correctly | Thomas Rast | 2008-08-13 |
* | Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge" | Johannes Schindelin | 2008-07-15 |
* | t3404: test two "preserve merges with -p" cases | Stephan Beyer | 2008-07-13 |
* | t3404: stricter tests for git-rebase--interactive | Stephan Beyer | 2008-06-22 |
* | Fix tests breaking when checkout path contains shell metacharacters | Bryan Donlan | 2008-05-05 |
* | add test_cmp function for test scripts | Jeff King | 2008-03-13 |
* | remove use of "tail -n 1" and "tail -1" | Jeff King | 2008-03-13 |
* | grep portability fix: don't use "-e" or "-q" | Jeff King | 2008-03-13 |
* | use build-time SHELL_PATH in test scripts | Jeff King | 2008-02-29 |
* | t3404: use configured shell instead of /bin/sh | Jeff King | 2008-02-20 |
* | Protect get_author_ident_from_commit() from filenames in work tree | Junio C Hamano | 2008-02-13 |
* | Add test for rebase -i with commits that do not pass pre-commit | Johannes Schindelin | 2008-01-28 |
* | rebase -p -i: handle "no changes" gracefully | Johannes Schindelin | 2007-12-17 |
* | rebase -i: move help to end of todo file | Johannes Schindelin | 2007-11-22 |
* | Merge branch 'maint' | Junio C Hamano | 2007-11-14 |
|\ |
|
| * | t/t3404: fix test for a bogus todo file. | Junio C Hamano | 2007-11-13 |
* | | Merge branch 'js/rebase-i' | Junio C Hamano | 2007-10-03 |
|\ \ |
|
| * | | rebase -i: work on a detached HEAD | Johannes Schindelin | 2007-09-26 |
* | | | Merge branch 'maint' | Junio C Hamano | 2007-09-29 |
|\ \ \
| |/ /
|/| /
| |/ |
|
| * | rebase -i: squash should retain the authorship of the _first_ commit | Johannes Schindelin | 2007-09-29 |
* | | rebase -i: commit when continuing after "edit" | Johannes Schindelin | 2007-09-25 |
|/ |
|
* | rebase -i: fix squashing corner case | Johannes Schindelin | 2007-08-23 |
* | t3404: fix "fake-editor" | Junio C Hamano | 2007-08-13 |
* | rebase -i: fix for optional [branch] parameter | Johannes Schindelin | 2007-08-01 |