Revision 69e66f5500ef6079e3374a6654ef1f6df0c6f360 authored by Johannes Sixt on 02 June 2008, 14:01:40 UTC, committed by Junio C Hamano on 03 June 2008, 03:36:14 UTC
If the upstream argument to rebase (the first argument) was relative to HEAD and the name of the branch to rebase (the second argument) was given, the upstream would have been interpreted relative to the second argument. In particular, this command git rebase -i HEAD topic would always finish with "Nothing to do". (a1bf91e fixed the same issue for non-interactive rebase.) Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent c5833f6
File | Mode | Size |
---|---|---|
xdiff.h | -rw-r--r-- | 2.9 KB |
xdiffi.c | -rw-r--r-- | 14.4 KB |
xdiffi.h | -rw-r--r-- | 1.8 KB |
xemit.c | -rw-r--r-- | 5.1 KB |
xemit.h | -rw-r--r-- | 1.1 KB |
xinclude.h | -rw-r--r-- | 1.2 KB |
xmacros.h | -rw-r--r-- | 1.9 KB |
xmerge.c | -rw-r--r-- | 12.1 KB |
xprepare.c | -rw-r--r-- | 10.7 KB |
xprepare.h | -rw-r--r-- | 1.1 KB |
xtypes.h | -rw-r--r-- | 1.6 KB |
xutils.c | -rw-r--r-- | 7.5 KB |
xutils.h | -rw-r--r-- | 1.7 KB |
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...