checkout: automerge local changes while switching branches.

diff --git a/git-push.sh b/git-push.sh
index edc0b8317a6d566895c4a2df6a3f7d86773ca138..1c5cf80f8786eb20c6092a8fbce48e1f1c1cb9e1 100755 (executable)
--- a/git-push.sh
+++ b/git-push.sh
@@ -1,10 +1,7 @@
 #!/bin/sh
-. git-sh-setup || die "Not a git archive"
-
-usage () {
-    die "Usage: git push [--all] [--force] <repository> [<refspec>]"
-}
 
+USAGE='[--all] [--force] <repository> [<refspec>...]'
+. git-sh-setup
 
 # Parse out parameters and then stop at remote, so that we can
 # translate it using .git/branches information