]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b63fafd) | patch
rebase: Fix the detection of fast-forwarding of the current branch to upstream.
authorRobert Shearman <rob@codeweavers.com>
Thu, 27 Jul 2006 09:32:25 +0000 (10:32 +0100)
committerJunio C Hamano <junkio@cox.net>
Mon, 31 Jul 2006 07:15:59 +0000 (00:15 -0700)
commit83c31614ceae2612b7cdba40e6401716fe854cd2
treee45d87ca6b9132b4e81075542dc581172524a972tree | snapshot
parentb63fafdfd844c2037fba53b9944431c1378b4135commit | diff
rebase: Fix the detection of fast-forwarding of the current branch to upstream.

Previously, a rebasing operation with on a branch that is just tracking
an upstream branch would output a confusing "Nothing to do" due to no
patches being given to git-am.

The test brings the behaviour back into line with that of just before
e646c9c8c0aa995eac284ea0a2117add19c4461c.

Signed-off-by: Robert Shearman <rob@codeweavers.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
git-rebase.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.