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

rebase: fix typo (force_rebas -> force-rebas)

2009-03-27T21:26:34Z

Signed-off-by: Michele Ballabio Signed-off-by: Junio C Hamano

rebase: add options passed to git-am

2009-03-19T02:25:01Z

Add the options --committer-date-is-author-date and --ignore-date to git-rebase. They were introduced in commit a79ec62d0 for git-am. These options imply --force-rebase. Signed-off-by: Michele Ballabio Signed-off-by: Junio C Hamano

Merge branch 'tv/rebase-stat'

2009-03-11T20:49:11Z

* tv/rebase-stat: git-pull: Allow --stat and --no-stat to be used with --rebase git-rebase: Add --stat and --no-stat for producing diffstat on rebase

Merge branch 'sr/force-rebase'

2009-03-05T23:41:40Z

* sr/force-rebase: Teach rebase to rebase even if upstream is up to date

git-rebase: Add --stat and --no-stat for producing diffstat on rebase

2009-03-03T07:22:32Z

The behavior of --verbose is unchanged, but uses a different state variable internally, so that the meaning of verbose output may be expanded without affecting the diffstat. This is also reflected in the documentation. The configuration option rebase.stat works the same was as merg.stat, but the default is currently false. Signed-off-by: Tor Arne Vestbø Signed-off-by: Junio C Hamano

disallow providing multiple upstream branches to rebase, pull --rebase

2009-02-18T19:14:04Z

It does not make sense to provide multiple upstream branches to either git pull --rebase, or to git rebase, so disallow both. Signed-off-by: Jay Soffian Signed-off-by: Junio C Hamano

Teach rebase to rebase even if upstream is up to date

2009-02-14T01:17:47Z

Normally, if the current branch is up to date, the rebase is aborted. However, it may be desirable to allow rebasing even if the current branch is up to date. When using the '--whitespace=fix' option -f is implied. Signed-off-by: Sverre Rabbelier Signed-off-by: Junio C Hamano

rebase: learn to rebase root commit

2009-01-12T07:03:36Z

Teach git-rebase a new option --root, which instructs it to rebase the entire history leading up to . This option must be used with --onto , and causes commits that already exist in to be skipped. (Normal operation skips commits that already exist in instead.) One possible use-case is with git-svn: suppose you start hacking (perhaps offline) on a new project, but later notice you want to commit this work to SVN. You will have to rebase the entire history, including the root commit, on a (possibly empty) commit coming from git-svn, to establish a history connection. This previously had to be done by cherry-picking the root commit manually. Signed-off-by: Thomas Rast Signed-off-by: Junio C Hamano

rebase: improve error messages about dirty state

2008-12-11T03:07:35Z

If you have unstaged changes in your working tree and try to rebase, you will get the cryptic "foo: needs update" message, but nothing else. If you have staged changes, you get "your index is not up-to-date". Let's improve this situation in two ways: - for unstaged changes, let's also tell them we are canceling the rebase, and why (in addition to the "needs update" lines) - for the staged changes case, let's use language that is a little more clear to the user: their index contains uncommitted changes Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

rebase: use git rev-parse -q

2008-12-03T22:27:17Z

Signed-off-by: Miklos Vajna Signed-off-by: Junio C Hamano