summaryrefslogtreecommitdiff
path: root/git-mergetool--lib.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-01-05 23:41:37 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-01-05 23:41:37 -0800
commit245d6d006408898613cdad35700d456e5d265722 (patch)
treee4b722a23316c8210d74d8ad0c0b7003f8be3408 /git-mergetool--lib.sh
parentMerge branch 'cr/push-force-tag-update' (diff)
parentfetch: ignore wildcarded refspecs that update local symbolic refs (diff)
downloadtgif-245d6d006408898613cdad35700d456e5d265722.tar.xz
Merge branch 'jc/fetch-ignore-symref'
Avoid false error from an attempt to update local symbolic ref via fetch. * jc/fetch-ignore-symref: fetch: ignore wildcarded refspecs that update local symbolic refs
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions