mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-09-24 23:21:35 +02:00
Code

git-merge: exclude unnecessary options from OPTIONS_SPEC

Browse Source 
gitcli(5) already documents them, and there are no options named
--no-no-stat, --no-no-summary and --no-no-log.

Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Miklos Vajna 2008-05-12 19:22:56 +02:00 committed by Junio C Hamano
parent 26ec126a91
commit c3170a83d6
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
git-merge.sh
View File

@ -9,11 +9,9 @@ git-merge [options] <remote>...
git-merge [options] <msg> HEAD <remote>
--
stat show a diffstat at the end of the merge
n,no-stat don't show a diffstat at the end of the merge
n don't show a diffstat at the end of the merge
summary (synonym to --stat)
no-summary (synonym to --no-stat)
log add list of one-line log to merge commit message
no-log don't add list of one-line log to merge commit message
squash create a single commit instead of doing a merge
commit perform a commit if the merge sucesses (default)
ff allow fast forward (default)