diff options
| author |  Santi Béjar <santi@agolina.net> | 2009-06-12 00:39:19 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2009-06-11 19:50:34 -0700 |
| commit | e9460a66e0d11b718757cd88eb0c927f2b79e1c8 (patch) | |
| tree | 8f54583f57b9f6ce08b394478eb5f86d11120d04 /t/t1000-read-tree-m-3way.sh | |
| parent | parse-remote: function to get the tracking branch to be merge (diff) | |
| download | tgif-e9460a66e0d11b718757cd88eb0c927f2b79e1c8.tar.xz | |
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>
Diffstat (limited to 't/t1000-read-tree-m-3way.sh')
0 files changed, 0 insertions, 0 deletions