git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 1b7e543)
bash: add missing 'git merge' options
authorSZEDER Gábor <redacted>
Sun, 15 Feb 2009 13:25:11 +0000 (14:25 +0100)
committerJunio C Hamano <redacted>
Mon, 16 Feb 2009 22:51:24 +0000 (14:51 -0800)
commitd532ebd5a799fe2c991a96004bf739434e6ecaf4
treea2827da5d5af8d08675a013a62d863f640f20d5atree | snapshot
parent1b7e543a6e2f156536a3cf227f9da1029bba6265commit | diff
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 <redacted>
Acked-by: Shawn O. Pearce <redacted>
Signed-off-by: Junio C Hamano <redacted>
contrib/completion/git-completion.bash diff | blob | history
git clone https://git.99rst.org/PROJECT