summaryrefslogtreecommitdiff
path: root/xdiff-interface.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-10-03 06:42:47 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-10-03 06:42:47 (GMT)
commitb2a2c4d8099c69ec997e51cac489c0947ad17956 (patch)
tree49f19be7f56bd175e4741fd054c205d77242560c /xdiff-interface.c
parent5f3108b7b6720ae3ce61caa1a3684b9fcac5c8db (diff)
parenta6304fa4c2f57b08ec0acea9f91c188f284f8374 (diff)
downloadgit-b2a2c4d8099c69ec997e51cac489c0947ad17956.zip
git-b2a2c4d8099c69ec997e51cac489c0947ad17956.tar.gz
git-b2a2c4d8099c69ec997e51cac489c0947ad17956.tar.bz2
Merge branch 'bc/rev-parse-parseopt-fix'
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: parse-options: only insert newline in help text if needed parse-options: write blank line to correct output stream t0040,t1502: Demonstrate parse_options bugs 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
Diffstat (limited to 'xdiff-interface.c')
0 files changed, 0 insertions, 0 deletions