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

2017-03-29 Thread Mike Lewis
I had defaulted it to "--commit" just to make it absolutely clear what the default was going to be, since passing the "--commit" flag to `git-merge` in this case doesn’t change the existing behavior. But you’re right that having the default be blank matches the existing style better, so I’ll

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

2017-03-29 Thread David Aguilar
On Sun, Mar 26, 2017 at 03:02:38AM -0400, Mike Lewis wrote: > Allows the user to verify and/or change the contents of the merge > before committing as necessary > > Signed-off-by: Mike Lewis > --- > contrib/subtree/git-subtree.sh | 17 + > 1 file changed, 13