summaryrefslogtreecommitdiff
path: root/git-merge.sh
diff options
context:
space:
mode:
authorRene Scharfe <rene.scharfe@lsrfire.ath.cx>2006-10-21 20:51:04 +0200
committerJunio C Hamano <junkio@cox.net>2006-10-22 12:15:55 -0700
commitfc61e313da0a124e9f6a213cd76944a8c4e6c918 (patch)
treeb6f5b574c5787e446adfaefb2e3c7b1caa4ffe65 /git-merge.sh
parent0b92f1a9d213644d2cd6c1870091c090a6b7eca9 (diff)
downloadgit-fc61e313da0a124e9f6a213cd76944a8c4e6c918.tar.gz
git-merge: show usage if run without arguments
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge.sh')
-rwxr-xr-xgit-merge.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/git-merge.sh b/git-merge.sh
index 5b34b4de99..789f4de595 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -93,6 +93,8 @@ finish () {
esac
}
+case "$#" in 0) usage ;; esac
+
rloga=
while case "$#" in 0) break ;; esac
do