Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
---
git-merge.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Show changes to git-merge.sh +1 −1
diff --git a/git-merge.sh b/git-merge.sh
index 5fc5f52..8026ccf 100755
--- 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 sucesses (default)
+commit perform a commit if the merge succeeds (default)
ff allow fast forward (default)
s,strategy= merge strategy to use
m,message= message to be used for the merge commit (if any)
--
1.5.5.3
Brandon Casey