Merge branch 'bc/rev-parse-parseopt-fix' into next
authorJunio C Hamano <gitster@pobox.com>
Sun, 24 Sep 2017 10:39:40 +0000 (19:39 +0900)
committerJunio C Hamano <gitster@pobox.com>
Sun, 24 Sep 2017 10:39:40 +0000 (19:39 +0900)
Recent versions of "git rev-parse --parseopt" did not parse the
option specification that does not have the optional flags (*=?!)
correctly, which has been corrected.

* bc/rev-parse-parseopt-fix:
git-rebase: don't ignore unexpected command line arguments
rev-parse parseopt: interpret any whitespace as start of help text
rev-parse parseopt: do not search help text for flag chars
t1502: demonstrate rev-parse --parseopt option mis-parsing

1  2 
builtin/rev-parse.c
git-rebase.sh
Simple merge
diff --cc git-rebase.sh
Simple merge