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

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

summary | shortlog | log | commit | commitdiff | tree
(merge: d8b1ce7 19800bd)

author	Junio C Hamano <redacted>
	Mon, 9 Sep 2019 19:26:38 +0000 (12:26 -0700)
committer	Junio C Hamano <redacted>
	Mon, 9 Sep 2019 19:26:38 +0000 (12:26 -0700)
commit	4c49dd042d34a44b3238ea901aeceeea716ab8e2
tree	35131d2feb8a2a31705d3c67e120f30fd0e5db3c	tree \| snapshot
parent	d8b1ce79729b1744727c29ec818c34ec43ee9599	commit \| diff
parent	19800bdc3f35fd0d0ab1bcef4dfa9ac69968288f	commit \| diff

Merge branch 'nd/diff-parseopt'

Compilation fix.

* nd/diff-parseopt:
parseopt: move definition of enum parse_opt_result up

parse-options.h

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