| Commit message (Expand) | Author | Age | Files | Lines |
* | rebase -i -p: fix parent rewriting | Thomas Rast | 2008-08-13 | 1 | -4/+2 |
* | rebase -i -p: handle index and workdir correctly | Thomas Rast | 2008-08-13 | 1 | -2/+12 |
* | rebase -i: When an 'edit' stops, mention the commit | Johannes Sixt | 2008-07-23 | 1 | -1/+1 |
* | Merge branch 'maint' | Junio C Hamano | 2008-07-16 | 1 | -0/+2 |
|\ |
|
| * | rebase-i: keep old parents when preserving merges | Stephan Beyer | 2008-07-16 | 1 | -0/+2 |
* | | Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge" | Johannes Schindelin | 2008-07-15 | 1 | -1/+1 |
* | | Merge branch 'jc/rebase-orig-head' | Junio C Hamano | 2008-07-14 | 1 | -0/+1 |
|\ \ |
|
| * | | Teach "am" and "rebase" to mark the original position with ORIG_HEAD | Junio C Hamano | 2008-07-07 | 1 | -0/+1 |
| |/ |
|
* | | Make rebase--interactive use OPTIONS_SPEC | Stephan Beyer | 2008-07-13 | 1 | -26/+51 |
|/ |
|
* | git-rebase -i: mention the short command aliases in the todo list | Miklos Vajna | 2008-06-08 | 1 | -3/+3 |
* | rebase --interactive: Compute upstream SHA1 before switching branches | Johannes Sixt | 2008-06-02 | 1 | -4/+3 |
* | Ignore dirty submodule states during rebase and stash | Johannes Schindelin | 2008-05-15 | 1 | -5/+6 |
* | remove use of "tail -n 1" and "tail -1" | Jeff King | 2008-03-13 | 1 | -1/+1 |
* | grep portability fix: don't use "-e" or "-q" | Jeff King | 2008-03-13 | 1 | -3/+3 |
* | Prompt to continue when editing during rebase --interactive | Jonathan del Strother | 2008-02-27 | 1 | -0/+4 |
* | rebase -i: accept -m as advertised in the man page | Uwe Kleine-K,Av(Bnig | 2008-02-11 | 1 | -1/+1 |
* | Squelch bogus progress output from git-rebase--interactive | Junio C Hamano | 2008-01-14 | 1 | -2/+7 |
* | git-rebase -i: clean-up error check codepath. | Junio C Hamano | 2007-12-30 | 1 | -10/+19 |
* | git-rebase -i behaves better on commits with incomplete messages | Junio C Hamano | 2007-12-30 | 1 | -2/+4 |
* | Reallow git-rebase --interactive --continue if commit is unnecessary | Shawn O. Pearce | 2007-12-20 | 1 | -1/+3 |
* | Catch and handle git-commit failures in git-rebase --interactive | Shawn O. Pearce | 2007-12-19 | 1 | -8/+9 |
* | Avoid update hook during git-rebase --interactive | Shawn O. Pearce | 2007-12-19 | 1 | -2/+2 |
* | Fix interactive rebase to preserve author email address | Sean | 2007-12-19 | 1 | -1/+1 |
* | rebase -p -i: handle "no changes" gracefully | Johannes Schindelin | 2007-12-17 | 1 | -1/+6 |
* | Merge branch 'js/rebase-i-rerere' | Junio C Hamano | 2007-12-02 | 1 | -1/+4 |
|\ |
|
| * | rebase -i: give rerere a chance | Johannes Schindelin | 2007-11-28 | 1 | -1/+4 |
* | | revert/cherry-pick: Allow overriding the help text by the calling Porcelain | Wincent Colaiuta | 2007-11-30 | 1 | -0/+5 |
|/ |
|
* | Merge branch 'maint' | Junio C Hamano | 2007-11-28 | 1 | -2/+2 |
|\ |
|
| * | scripts: do not get confused with HEAD in work tree | Junio C Hamano | 2007-11-28 | 1 | -2/+2 |
* | | rebase -i: move help to end of todo file | Johannes Schindelin | 2007-11-22 | 1 | -6/+8 |
* | | Merge branch 'ph/parseopt-sh' | Junio C Hamano | 2007-11-17 | 1 | -0/+1 |
|\ \ |
|
| * | | scripts: Add placeholders for OPTIONS_SPEC | Junio C Hamano | 2007-11-06 | 1 | -0/+1 |
* | | | Merge branch 'maint' | Junio C Hamano | 2007-11-09 | 1 | -1/+1 |
|\ \ \
| |/ /
|/| /
| |/ |
|
| * | Avoid a few unportable, needlessly nested "...`...". | Ralf Wildenhues | 2007-11-08 | 1 | -1/+1 |
* | | Merge branch 'maint' into HEAD | Junio C Hamano | 2007-10-30 | 1 | -3/+4 |
|\ \
| |/ |
|
| * | git-rebase--interactive.sh: Make 3-way merge strategies work for -p. | Björn Steinbrink | 2007-10-30 | 1 | -0/+2 |
| * | git-rebase--interactive.sh: Don't pass a strategy to git-cherry-pick. | Björn Steinbrink | 2007-10-30 | 1 | -2/+2 |
| * | Fix --strategy parsing in git-rebase--interactive.sh | Björn Steinbrink | 2007-10-30 | 1 | -1/+0 |
* | | git-rebase--interactive.sh: Quote arguments to test | Michael W. Olson | 2007-10-16 | 1 | -1/+1 |
* | | Merge branch 'maint' | Shawn O. Pearce | 2007-10-15 | 1 | -2/+2 |
|\ \
| |/ |
|
| * | rebase -i: use diff plumbing instead of porcelain | Johannes Schindelin | 2007-10-15 | 1 | -2/+2 |
* | | Merge branch 'js/rebase-i' | Junio C Hamano | 2007-10-03 | 1 | -8/+15 |
|\ \ |
|
| * | | rebase -i: work on a detached HEAD | Johannes Schindelin | 2007-09-26 | 1 | -8/+15 |
| * | | Merge branch 'jc/autogc' into js/rebase-i | Junio C Hamano | 2007-09-26 | 1 | -0/+2 |
| |\ \ |
|
* | \ \ | Merge branch 'jc/autogc' | Junio C Hamano | 2007-10-03 | 1 | -0/+2 |
|\ \ \ \
| | |/ /
| |/| | |
|
| * | | | Invoke "git gc --auto" from commit, merge, am and rebase. | Junio C Hamano | 2007-09-06 | 1 | -0/+2 |
* | | | | Merge branch 'maint' | Junio C Hamano | 2007-09-29 | 1 | -1/+1 |
|\ \ \ \
| | |_|/
| |/| | |
|
| * | | | rebase -i: squash should retain the authorship of the _first_ commit | Johannes Schindelin | 2007-09-29 | 1 | -1/+1 |
* | | | | rebase -i: support single-letter abbreviations for the actions | Johannes Schindelin | 2007-09-29 | 1 | -4/+4 |
| |_|/
|/| | |
|
* | | | rebase -i: create .dotest-merge after validating options. | Matt Kraai | 2007-09-26 | 1 | -4/+4 |