aboutsummaryrefslogtreecommitdiff
path: root/dir.h
diff options
context:
space:
mode:
authorDaniel Barkalow <barkalow@iabervon.org>2007-09-28 19:34:17 -0400
committerJunio C Hamano <gitster@pobox.com>2007-09-29 22:11:52 -0700
commitcfb8f898a883e2fb2fd5ecec0fe83662b64f1373 (patch)
tree69ec849b65636b663d71b25e8688ae6c0ad261fc /dir.h
parent4491e62ae932d5774f628d1bd3be663c11058a73 (diff)
downloadgit-cfb8f898a883e2fb2fd5ecec0fe83662b64f1373.tar.gz
git-cfb8f898a883e2fb2fd5ecec0fe83662b64f1373.tar.xz
Allow abbreviations in the first refspec to be merged
The config item for a refspec side and the ref name that it matches aren't necessarily character-for-character identical. We actually want to merge a ref by default if: there is no per-branch config, it is the found result of looking for the match for the first refspec, and the first refspec is not a pattern. Beyond that, anything that get_fetch_map() thinks matches is fine. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'dir.h')
0 files changed, 0 insertions, 0 deletions