diff options
| author | Miklos Vajna <vmiklos@frugalware.org> | 2008-05-12 19:22:56 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-21 12:54:49 -0700 |
| commit | c3170a83d6fee30c5d10afe33d88867ba0b68218 (patch) | |
| tree | cdaa24213da23edf0784529cca0913660f7418e5 /git-merge.sh | |
| parent | 26ec126a9166be39f79e746a3a8c92205c983820 (diff) | |
| download | git-c3170a83d6fee30c5d10afe33d88867ba0b68218.tar.gz git-c3170a83d6fee30c5d10afe33d88867ba0b68218.tar.xz | |
git-merge: exclude unnecessary options from OPTIONS_SPEC
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>
Diffstat (limited to 'git-merge.sh')
| -rwxr-xr-x | git-merge.sh | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/git-merge.sh b/git-merge.sh index 69b35d87e..5fc5f5201 100755 --- a/git-merge.sh +++ b/git-merge.sh @@ -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) |