summaryrefslogtreecommitdiff
path: root/Documentation/urls-remotes.txt
diff options
context:
space:
mode:
authorLibravatar Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>2010-11-13 23:58:22 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-11-29 15:06:40 -0800
commitfe249b4219f66ae3aacfac50ad19b38c370ad115 (patch)
tree1856bcb80e9f3306e26f6b325b6a0964ed2c6d1c /Documentation/urls-remotes.txt
parentMerge branch 'cb/maint-orphan-merge-noclobber' (diff)
downloadtgif-fe249b4219f66ae3aacfac50ad19b38c370ad115.tar.xz
Use reflog in 'pull --rebase . foo'
Since c85c792 (pull --rebase: be cleverer with rebased upstream branches, 2008-01-26), "git pull --rebase" has used the reflog to try to rebase from the old upstream onto the new upstream. Make this work if the local repository is explicitly passed on the command line as in 'git pull --rebase . foo'. Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> Acked-by: Santi BĂ©jar <santi@agolina.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/urls-remotes.txt')
0 files changed, 0 insertions, 0 deletions