Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
git-merge.sh: fix typo in usage message: sucesses --> succeeds
author
Brandon Casey
<casey@nrlssc.navy.mil>
Wed, 18 Jun 2008 20:16:08 +0000
(15:16 -0500)
committer
Junio C Hamano
<gitster@pobox.com>
Thu, 19 Jun 2008 21:13:02 +0000
(14:13 -0700)
Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-merge.sh
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
e449f10
)
diff --git
a/git-merge.sh
b/git-merge.sh
index 5fc5f5201f8ea8e155a25795b93bfea86fc12d12..8026ccff4a459a75148740382646f7fe10b00255 100755
(executable)
--- a/
git-merge.sh
+++ b/
git-merge.sh
@@
-13,7
+13,7
@@
n don't show a diffstat at the end of the merge
summary (synonym to --stat)
log 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 suc
esse
s (default)
+commit perform a commit if the merge suc
ceed
s (default)
ff allow fast forward (default)
s,strategy= merge strategy to use
m,message= message to be used for the merge commit (if any)