Merge branch 'rs/leave-base-name-in-name-field-of-tar' into maint

diff --git a/git-rebase--am.sh b/git-rebase--am.sh
index 04d89415fe8ca1634fa362c66ea9569794dcadd5..392ebc9790c88f9857fc4e943d1fe6351e953c7d 100644 (file)
--- a/git-rebase--am.sh
+++ b/git-rebase--am.sh
@@ -3,8 +3,6 @@
 # Copyright (c) 2010 Junio C Hamano.
 #
 
-. git-sh-setup
-
 case "$action" in
 continue)
        git am --resolved --resolvemsg="$resolvemsg" &&