summaryrefslogtreecommitdiff
path: root/interpolate.h
diff options
context:
space:
mode:
authorLibravatar Johannes Sixt <johannes.sixt@telecom.at>2008-06-02 16:01:40 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-06-02 20:36:14 -0700
commit69e66f5500ef6079e3374a6654ef1f6df0c6f360 (patch)
treedad8587f8117efcdf8cbdcce735f32a470c507a7 /interpolate.h
parentDocumentation/git-filter-branch.txt: Fix description of --commit-filter (diff)
downloadtgif-69e66f5500ef6079e3374a6654ef1f6df0c6f360.tar.xz
rebase --interactive: Compute upstream SHA1 before switching branches
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>
Diffstat (limited to 'interpolate.h')
0 files changed, 0 insertions, 0 deletions