undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-merge.sh: fix typo in usage message: sucesses --> succeeds

Browse Source 
Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Brandon Casey 2008-06-18 15:16:08 -05:00 committed by Junio C Hamano
parent e449f10580
commit 037e98f202
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-merge.sh
View File

@ -13,7 +13,7 @@ n don't show a diffstat at the end of the merge
summary (synonym to --stat) summary (synonym to --stat)
log add list of one-line log to merge commit message log add list of one-line log to merge commit message
squash create a single commit instead of doing a merge squash create a single commit instead of doing a merge
commit perform a commit if the merge sucesses (default) commit perform a commit if the merge succeeds (default)
ff allow fast forward (default) ff allow fast forward (default)
s,strategy= merge strategy to use s,strategy= merge strategy to use
m,message= message to be used for the merge commit (if any) m,message= message to be used for the merge commit (if any)