diff options
| author |  SZEDER Gábor <szeder@ira.uka.de> | 2009-02-15 14:25:11 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2009-02-16 14:51:24 -0800 |
| commit | d532ebd5a799fe2c991a96004bf739434e6ecaf4 (patch) | |
| tree | a2827da5d5af8d08675a013a62d863f640f20d5a /gitweb | |
| parent | git-svn: Fix for rewriteRoot URL containing username. (diff) | |
| download | tgif-d532ebd5a799fe2c991a96004bf739434e6ecaf4.tar.xz | |
bash: add missing 'git merge' options
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@ira.uka.de>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'gitweb')
0 files changed, 0 insertions, 0 deletions