Merge branch 'nd/show-gitcomp-compilation-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Sat, 15 Dec 2018 03:24:33 +0000 (12:24 +0900)
committerJunio C Hamano <gitster@pobox.com>
Sat, 15 Dec 2018 03:24:33 +0000 (12:24 +0900)
Portability fix for a recent update to parse-options API.

* nd/show-gitcomp-compilation-fix:
parse-options: fix SunCC compiler warning

1  2 
builtin/blame.c
builtin/shortlog.c
builtin/update-index.c
parse-options.c
parse-options.h
diff --cc builtin/blame.c
Simple merge
Simple merge
Simple merge
diff --cc parse-options.c
Simple merge
diff --cc parse-options.h
Simple merge