diff --git a/bin/git-changelog b/bin/git-changelog
index 912c46f..28cda0e 100755
--- a/bin/git-changelog
+++ b/bin/git-changelog
@@ -3,25 +3,28 @@
 DATE=`date +'%Y-%m-%d'`
 HEAD="\nn.n.n / $DATE \n==================\n\n"
 
-if test "$1" = "--list"; then
-  version=`git for-each-ref refs/tags --sort=-authordate --format='%(refname)' \
-    --count=1 | sed 's/^refs\/tags\///'`
-  if test -z "$version"; then
-    git log --pretty="format:  * %s"
-  else
-    git log --pretty="format:  * %s" $version..
-  fi
-else
-  CHANGELOG=$1
-  if test "$CHANGELOG" = ""; then
-    CHANGELOG=`ls | egrep 'change|history' -i`
-    if test "$CHANGELOG" = ""; then CHANGELOG='History.md'; fi
-  fi
-  tmp="/tmp/changelog"
-  printf "$HEAD" > $tmp
-  git-changelog --list >> $tmp
-  printf '\n' >> $tmp
-  if [ -f $CHANGELOG ]; then cat $CHANGELOG >> $tmp; fi
-  mv $tmp $CHANGELOG
-  test -n "$EDITOR" && $EDITOR $CHANGELOG
-fi
+case "$1" in
+  -l|--list)
+    version=`git for-each-ref refs/tags --sort=-authordate --format='%(refname)' \
+      --count=1 | sed 's/^refs\/tags\///'`
+    if test -z "$version"; then
+      git log --pretty="format:  * %s"
+    else
+      git log --pretty="format:  * %s" $version..
+    fi
+    ;;
+  *)
+    CHANGELOG=$1
+    if test "$CHANGELOG" = ""; then
+      CHANGELOG=`ls | egrep 'change|history' -i`
+      if test "$CHANGELOG" = ""; then CHANGELOG='History.md'; fi
+    fi
+    tmp="/tmp/changelog"
+    printf "$HEAD" > $tmp
+    git-changelog --list >> $tmp
+    printf '\n' >> $tmp
+    if [ -f $CHANGELOG ]; then cat $CHANGELOG >> $tmp; fi
+    mv $tmp $CHANGELOG
+    test -n "$EDITOR" && $EDITOR $CHANGELOG
+    ;;
+esac
\ No newline at end of file