Commits

David Aguilar committed ce2c3eb

git-mergetool: properly handle "git mergetool -- filename"

Like many git commands, git-mergetool allows "--" to signal
the end of option processing. This adds a missing "shift"
statement so that this is correctly handled.

Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

  • Participants
  • Parent commits 0e73b3e

Comments (0)

Files changed (1)

 	    esac
 	    ;;
 	--)
+	    shift
 	    break
 	    ;;
 	-*)