| commit | d532ebd5a799fe2c991a96004bf739434e6ecaf4 | |
| author | SZEDER Gábor <szeder@ira.uka.de> | |
| Sun, 15 Feb 2009 13:25:11 +0000 (15 14:25 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 16 Feb 2009 22:51:24 +0000 (16 14:51 -0800) | ||
| tree | a2827da5d5af8d08675a013a62d863f640f20d5a | treesnapshot (tar.gz zip) |
| parent | 1b7e543a6e2f156536a3cf227f9da1029bba6265 | commitdiff |
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>
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>
| contrib/completion/git-completion.bash | diffblobblamehistory |