Re: [PATCH v2] bash: add missing 'git merge' options

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



SZEDER Gábor <szeder@xxxxxxxxxx> wrote:
> Namely: '--commit', '--stat', '--no-squash', '--ff', '--no-ff'.
> 
> One might wonder why add options that specify the default behaviour
> anyway (e.g. '--commit', '--no-squash', etc.).  Users can override the
> default with config options (e.g. 'branch.<name>.mergeoptions',
> 'merge.log'), but sometimes might still need the default behaviour.
> 
> Signed-off-by: SZEDER Gábor <szeder@xxxxxxxxxx>
> ---

Acked-by: Shawn O. Pearce <spearce@xxxxxxxxxxx>

>  contrib/completion/git-completion.bash |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)

-- 
Shawn.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux