diff --git a/git-merge.sh b/git-merge.sh
index 69b35d87e62b628d45f8e934f163b7ef64e2dda6..8026ccff4a459a75148740382646f7fe10b00255 100755 (executable)
--- a/git-merge.sh
+++ b/git-merge.sh
git-merge [options] <msg> HEAD <remote>
--
stat show a diffstat at the end of the merge
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)
summary (synonym to --stat)
-no-summary (synonym to --no-stat)
log add list of one-line log to merge commit message
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
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)
ff allow fast forward (default)
s,strategy= merge strategy to use
m,message= message to be used for the merge commit (if any)