| commit | b2f82e05de2512ae4adb63b669f6c1fe6cba3148 | |
| author | Sverre Rabbelier <srabbelier@gmail.com> | |
| Fri, 13 Feb 2009 22:48:01 +0000 (13 23:48 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 14 Feb 2009 01:17:47 +0000 (13 17:17 -0800) | ||
| tree | 212c260d905d8741bffa389b9061f828b2cc76be | treesnapshot (tar.gz zip) |
| parent | 5cd12b85fe8ff74f202a158511ead34e8aba584c | commitdiff |
Teach rebase to rebase even if upstream is up to date
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 <srabbelier@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 <srabbelier@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-rebase.sh | diffblobblamehistory |