git/git-rebase--interactive.sh, branch v1.6.3

rebase -i: avoid 'git reset' when possible

2009-03-03T18:56:22Z

When picking commits whose parents have not changed, we do not need to rewrite the commit. We do not need to reset the working directory to the parent's state, either. Requested by Sverre Rabbelier. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

Merge branch 'js/maint-rebase-i-submodule'

2009-02-01T02:07:55Z

* js/maint-rebase-i-submodule: Fix submodule squashing into unrelated commit rebase -i squashes submodule changes into unrelated commit

Fix submodule squashing into unrelated commit

2009-01-28T22:54:58Z

Actually, I think the issue is pretty independent of submodules; when "git commit" gets an empty parameter, it misinterprets it as a file. So avoid passing an empty parameter to "git commit". Actually, this is a nice cleanup, as MSG_FILE and EDIT_COMMIT were mutually exclusive; use one variable instead Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

rebase -i: correctly remember --root flag across --continue

2009-01-27T05:23:19Z

d911d14 (rebase -i: learn to rebase root commit, 2009-01-02) tried to remember the --root flag across a merge conflict in a broken way. Introduce a flag file $DOTEST/rebase-root to fix and clarify. While at it, also make sure $UPSTREAM is always initialized to guard against existing values in the environment. [tr: added tests] Signed-off-by: Thomas Rast Signed-off-by: Junio C Hamano

rebase -i --root: fix check for number of arguments

2009-01-26T06:06:50Z

If we are not rebasing with --root, then $# can only be either 1 (base) or 2 (base and the name of the branch to be rebased). If we are rebasing with --root, then it is Ok if $# is 0 (rebase the current branch down to everything) or 1 (rebase the named branch down to everything). Signed-off-by: Johannes Schindelin Acked-by: Thomas Rast Signed-off-by: Junio C Hamano

Merge branch 'tr/rebase-root'

2009-01-18T07:06:38Z

* tr/rebase-root: rebase: update documentation for --root rebase -i: learn to rebase root commit rebase: learn to rebase root commit rebase -i: execute hook only after argument checking

Merge branch 'maint-1.6.0' into maint

2009-01-13T08:40:19Z

* maint-1.6.0: Avoid spurious error messages on error mistakes. contrib/examples/README: give an explanation of the status of these files

Avoid spurious error messages on error mistakes.

2009-01-13T08:21:31Z

Prior to that, if the user chose "squash" as a first action, the stderr looked like: grep: /home/madcoder/dev/scm/git/.git/rebase-merge/done: No such file or directory Cannot 'squash' without a previous commit Now the first line is gone. Signed-off-by: Pierre Habouzit Signed-off-by: Junio C Hamano

rebase -i: learn to rebase root commit

2009-01-12T07:04:45Z

Teach git-rebase -i a new option --root, which instructs it to rebase the entire history leading up to . This is mainly for symmetry with ordinary git-rebase; it cannot be used to edit the root commit in-place (it requires --onto ). Commits that already exist in are skipped. In the normal mode of operation, this is fairly straightforward. We run cherry-pick in a loop, and cherry-pick has supported picking the root commit since f95ebf7 (Allow cherry-picking root commits, 2008-07-04). In --preserve-merges mode, we track the mapping from old to rewritten commits and use it to update the parent list of each commit. In this case, we define 'rebase -i -p --root --onto $onto $branch' to rewrite the parent list of all root commit(s) on $branch to contain $onto instead. Signed-off-by: Thomas Rast Signed-off-by: Junio C Hamano

rebase -i: execute hook only after argument checking

2009-01-03T22:22:50Z

Previously, the pre-rebase-hook would be launched before we knew if the [] arguments were supplied. Signed-off-by: Thomas Rast Signed-off-by: Junio C Hamano