Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
gitweb: Filter out commit ID from @difftree in git_commit and git_commitdiff
[gitweb.git]
/
git-merge.sh
diff --git
a/git-merge.sh
b/git-merge.sh
index 49c46d55df3491460864b3afd751258ec8ec97c7..cb094388bb5c830d37a790f5e7bbf13e8c61352a 100755
(executable)
--- 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