diff options
| author |  Johannes Sixt <johannes.sixt@telecom.at> | 2007-09-01 09:25:27 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2007-09-01 02:23:05 -0700 |
| commit | 7afa845edc09d2818af5fe67a0eb45ec579d1260 (patch) | |
| tree | 6e132b3f4b3d33a5216ea86c3b1c67607de898a9 /git.c | |
| parent | git-diff: resurrect the traditional empty "diff --git" behaviour (diff) | |
| download | tgif-7afa845edc09d2818af5fe67a0eb45ec579d1260.tar.xz | |
rebase -m: Fix incorrect short-logs of already applied commits.
When a topic branch is rebased, some of whose commits are already
cherry-picked upstream:
o--X--A--B--Y <- master
\
A--B--Z <- topic
then 'git rebase -m master' would report:
Already applied: 0001 Y
Already applied: 0002 Y
With this fix it reports the expected:
Already applied: 0001 A
Already applied: 0002 B
As an added bonus, this change also avoids 'echo' of a commit message,
which might contain escapements.
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git.c')
0 files changed, 0 insertions, 0 deletions