Junio C Hamano venit, vidit, dixit 24.09.2017 01:48: > Michael J Gruber <git@xxxxxxxxx> writes: > >> From: Michael J Gruber <git@xxxxxxxxxxxxxxxxxxxx> >> >> Analogous to commit, introduce a '--no-verify' option which bypasses the >> pre-merge hook. The shorthand '-n' is taken by the (non-existing) >> '--no-stat' already. >> >> Signed-off-by: Michael J Gruber <git@xxxxxxxxx> >> --- > > It appears that some of the pieces in this patch, namely, > D/git-merge.txt and D/merge-options.txt, belong to 2/4, where we are > fixing up an earlier addition of --[no-]verify option to the > command, to be updated to only add mention of pre-merge hook in this > step? Oh, sorry, rebaser error. I should also rewrite all commits to my current e-mail. > The end result looks good regardless, I would think, though. Pending restructuring and attending to the other comments...
