]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: aa25c82 f7e68a0)
Merge branch 'nd/diff-parseopt'
authorJunio C Hamano <gitster@pobox.com>
Thu, 30 May 2019 17:50:44 +0000 (10:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 May 2019 17:50:44 +0000 (10:50 -0700)
commit20aa7c594fbc2e36476daae2f53d7c020306c62c
tree16594455c941e4bc0002e32a624d27a29b0caeedtree | snapshot
parentaa25c82427ae70aebf3b8f970f2afd54e9a2a8c6commit | diff
parentf7e68a08780e91d7c2f830f33457041407172b96commit | diff
Merge branch 'nd/diff-parseopt'

A brown-paper-bag bugfix to a change already in 'master'.

* nd/diff-parseopt:
  parse-options: check empty value in OPT_INTEGER and OPT_ABBREV
  diff-parseopt: restore -U (no argument) behavior
  diff-parseopt: correct variable types that are used by parseopt
diff.c diff1 | diff2 | blob | history
diff.h diff1 | diff2 | blob | history
parse-options-cb.c diff1 | diff2 | blob | history
parse-options.c diff1 | diff2 | blob | history
t/t4013-diff-various.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.