summaryrefslogtreecommitdiff
path: root/git-gui/Makefile
diff options
context:
space:
mode:
authorLibravatar Michael Haggerty <mhagger@alum.mit.edu>2013-10-30 06:33:12 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-10-30 14:16:42 -0700
commitf096e6e826678c29e4bfde4d9d1ae1df79074ce3 (patch)
tree64cca6251eb19dace502f26cf24688e7583e03aa /git-gui/Makefile
parenthandle_duplicate(): mark error message for translation (diff)
downloadtgif-f096e6e826678c29e4bfde4d9d1ae1df79074ce3.tar.xz
fetch: improve the error messages emitted for conflicting refspecs
If we find two refspecs that want to update the same local reference, emit an error message that is more informative based on whether one of the conflicting refspecs is an opportunistic update during a fetch with explicit command-line refspecs. And especially, do not die if an opportunistic reference update conflicts with an express wish of the user; rather, just emit a warning and skip the opportunistic reference update. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-gui/Makefile')
0 files changed, 0 insertions, 0 deletions