diff options
| author |  Robert Shearman <rob@codeweavers.com> | 2006-07-27 10:32:25 +0100 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2006-07-31 00:15:59 -0700 |
| commit | 83c31614ceae2612b7cdba40e6401716fe854cd2 (patch) | |
| tree | e45d87ca6b9132b4e81075542dc581172524a972 /Documentation/git-merge-one-file.txt | |
| parent | tar-tree: illustrate an obscure feature better (diff) | |
| download | tgif-83c31614ceae2612b7cdba40e6401716fe854cd2.tar.xz | |
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>
Diffstat (limited to 'Documentation/git-merge-one-file.txt')
0 files changed, 0 insertions, 0 deletions