![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Mon, 1 Jan 2007 01:44:37 +0000 (17:44 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Mon, 1 Jan 2007 02:53:26 +0000 (18:53 -0800) | ||
| commit | fbc9012307d3b2e1bcee84e4455b11e97f580e07 | |
| tree | 261cc2bad5923a5fc91d627f34afc18c999073bc | tree | snapshot |
| parent | 63c97ce228f2d2697a8ed954a9592dfb5f286338 | commit | diff |
Do not merge random set of refs out of wildcarded refs
When your fetch configuration has only the wildcards, we would
pick the lexicographically first ref from the remote side for
merging, which was complete nonsense. Make sure nothing except
the one that is specified with branch.*.merge is merged in this
case.
Signed-off-by: Junio C Hamano <junkio@cox.net>
When your fetch configuration has only the wildcards, we would
pick the lexicographically first ref from the remote side for
merging, which was complete nonsense. Make sure nothing except
the one that is specified with branch.*.merge is merged in this
case.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| git-parse-remote.sh | diff | blob | history |