git.99rst.org Git - git.git/commit

git.99rst.org / git.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 6be6e66 a92ec7e)

author	Junio C Hamano <redacted>
	Sat, 15 Dec 2018 03:24:33 +0000 (12:24 +0900)
committer	Junio C Hamano <redacted>
	Sat, 15 Dec 2018 03:24:33 +0000 (12:24 +0900)
commit	bf29f074ed7019abb53398c4cd5659d9f939d9a8
tree	0980dba5e1b347ef0c2fad32cb36923dd64b83c5	tree \| snapshot
parent	6be6e6629fe9da1bfef904d2615536ad0db14e1d	commit \| diff
parent	a92ec7efe0ad25f1c2047230c0324dcb54ce1cfc	commit \| diff

Merge branch 'nd/show-gitcomp-compilation-fix' into maint

Portability fix for a recent update to parse-options API.

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

builtin/blame.c	diff1 \|	diff2 \|	blob \| history
builtin/shortlog.c	diff1 \|	diff2 \|	blob \| history
builtin/update-index.c	diff1 \|	diff2 \|	blob \| history
parse-options.c	diff1 \|	diff2 \|	blob \| history
parse-options.h	diff1 \|	diff2 \|	blob \| history

git clone https://git.99rst.org/PROJECT