![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 21 Jun 2009 04:47:13 +0000 (21:47 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 21 Jun 2009 04:47:13 +0000 (21:47 -0700) |
* sb/pull-rebase:
parse-remote: remove unused functions
parse-remote: support default reflist in get_remote_merge_branch
parse-remote: function to get the tracking branch to be merge
parse-remote: remove unused functions
parse-remote: support default reflist in get_remote_merge_branch
parse-remote: function to get the tracking branch to be merge
| 1 | 2 | |||
|---|---|---|---|---|
| git-pull.sh | patch | | diff1 | | diff2 | | blob | history |
diff --cc git-pull.sh
Simple merge