Re: [PATCH 3/4] merge: --no-verify to bypass pre-merge hook

2017-09-25 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 24.09.2017 01:48: > Michael J Gruber writes: > >> From: Michael J Gruber >> >> 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

Re: [PATCH 3/4] merge: --no-verify to bypass pre-merge hook

2017-09-23 Thread Junio C Hamano
Michael J Gruber writes: > From: Michael J Gruber > > 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 > --- It appears that some of the pieces

[PATCH 3/4] merge: --no-verify to bypass pre-merge hook

2017-09-22 Thread Michael J Gruber
From: Michael J Gruber 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 --- Documentation/git-merge.txt | 2 +- Documentation/githooks.txt | 2