Re: [PATCH] contrib/subtree: add "--no-commit" flag for merge and pull

2017-03-29 Thread Mike Lewis
ommit" and "--no-commit" options in $OPTS_SPEC leads to the expected resulting argument, but I wasn't sure if both arguments should be documented, as none of the other "default" options (for instance, "--no-squash") are documented in the help output. But please

[PATCH] contrib/subtree: add "--no-commit" flag for merge and pull

2017-03-26 Thread Mike Lewis
Allows the user to verify and/or change the contents of the merge before committing as necessary Signed-off-by: Mike Lewis <m...@mplew.is> --- contrib/subtree/git-subtree.sh | 17 + 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/contrib/subtree/git-subtre

Re: Server-side hooks on non-bare repository

2017-03-06 Thread Mike Lewis
ys, thanks for responding, and I apologize again if my first email was poorly written and rushed. Mike Lewis > On Mar 6, 2017, at 16:42, Junio C Hamano <gits...@pobox.com> wrote: > > Mike Lewis <m...@mplew.is> writes: > >> I’m having some issues with using server-

Server-side hooks on non-bare repository

2017-03-03 Thread Mike Lewis
duced in 2.3.0. Thanks, and I’d be happy to provide any other information that anyone needs to take a look at this. Mike Lewis