diff options
author | Junio C Hamano <junkio@cox.net> | 2006-12-31 17:44:37 -0800 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-12-31 18:53:26 -0800 |
commit | fbc9012307d3b2e1bcee84e4455b11e97f580e07 (patch) | |
tree | 261cc2bad5923a5fc91d627f34afc18c999073bc /t/t4115-apply-symlink.sh | |
parent | Fix formatting for urls section of fetch, pull, and push manpages (diff) | |
download | tgif-fbc9012307d3b2e1bcee84e4455b11e97f580e07.tar.xz |
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>
Diffstat (limited to 't/t4115-apply-symlink.sh')
0 files changed, 0 insertions, 0 deletions