| commit | e9460a66e0d11b718757cd88eb0c927f2b79e1c8 | |
| author | Santi Béjar <santi@agolina.net> | |
| Thu, 11 Jun 2009 22:39:19 +0000 (12 00:39 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 12 Jun 2009 02:50:34 +0000 (11 19:50 -0700) | ||
| tree | 8f54583f57b9f6ce08b394478eb5f86d11120d04 | treesnapshot (tar.gz zip) |
| parent | 97af7ff0553ed81bb905dbc0c8b0f9a0c10bfb3d | commitdiff |
parse-remote: support default reflist in get_remote_merge_branch
Expand get_remote_merge_branch to compute the tracking branch to merge
when called without arguments (or only the remote name). This allows
"git pull --rebase" without arguments (default upstream branch) to
work with a rebased upstream. With explicit arguments it already worked.
Also add a test to check for this case.
Signed-off-by: Santi Béjar <santi@agolina.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Expand get_remote_merge_branch to compute the tracking branch to merge
when called without arguments (or only the remote name). This allows
"git pull --rebase" without arguments (default upstream branch) to
work with a rebased upstream. With explicit arguments it already worked.
Also add a test to check for this case.
Signed-off-by: Santi Béjar <santi@agolina.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-parse-remote.sh | diffblobblamehistory | |
| t/t5520-pull.sh | diffblobblamehistory |