| commit | 97af7ff0553ed81bb905dbc0c8b0f9a0c10bfb3d | |
| author | Santi Béjar <santi@agolina.net> | |
| Thu, 11 Jun 2009 22:39:18 +0000 (12 00:39 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 12 Jun 2009 02:49:59 +0000 (11 19:49 -0700) | ||
| tree | f8acd8c16a79d98f64ef40aeb699428839140993 | treesnapshot (tar.gz zip) |
| parent | cb9d398c3506a6354a1c63d265a4228fcec28fda | commitdiff |
parse-remote: function to get the tracking branch to be merge
The only user of get_remote_refs_for_fetch was "git pull --rebase" and
it only wanted the tracking branch to be merge. So, add a simple
function (get_remote_merge_branch) with this new meaning.
No behavior changes. The new function behaves like the old code in
"git pull --rebase". In particular, it only works with the default
refspec mapping and with remote branches, not tags.
Signed-off-by: Santi Béjar <santi@agolina.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
The only user of get_remote_refs_for_fetch was "git pull --rebase" and
it only wanted the tracking branch to be merge. So, add a simple
function (get_remote_merge_branch) with this new meaning.
No behavior changes. The new function behaves like the old code in
"git pull --rebase". In particular, it only works with the default
refspec mapping and with remote branches, not tags.
Signed-off-by: Santi Béjar <santi@agolina.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-parse-remote.sh | diffblobblamehistory | |
| git-pull.sh | diffblobblamehistory |