po/TEAMS: Added Bulgarian team

diff --git a/git-rebase--am.sh b/git-rebase--am.sh
index 97f31dc7af43bafe36d3222ba2f78da861a4e620..a4f683a5d70213151f3713cc0a2d76dfe8293fd3 100644 (file)
--- a/git-rebase--am.sh
+++ b/git-rebase--am.sh
@@ -1,4 +1,5 @@
-#!/bin/sh
+# This shell script fragment is sourced by git-rebase to implement
+# its default, fast, patch-based, non-interactive mode.
 #
 # Copyright (c) 2010 Junio C Hamano.
 #
@@ -7,12 +8,12 @@ case "$action" in
 continue)
        git am --resolved --resolvemsg="$resolvemsg" &&
        move_to_original_branch
-       exit
+       return
        ;;
 skip)
        git am --skip --resolvemsg="$resolvemsg" &&
        move_to_original_branch
-       exit
+       return
        ;;
 esac
 
@@ -31,8 +32,8 @@ else
        rm -f "$GIT_DIR/rebased-patches"
 
        git format-patch -k --stdout --full-index --ignore-if-in-upstream \
-               --src-prefix=a/ --dst-prefix=b/ \
-               --no-renames $root_flag "$revisions" >"$GIT_DIR/rebased-patches"
+               --src-prefix=a/ --dst-prefix=b/ --no-renames --no-cover-letter \
+               $root_flag "$revisions" >"$GIT_DIR/rebased-patches"
        ret=$?
 
        if test 0 != $ret
@@ -56,7 +57,7 @@ else
 
                As a result, git cannot rebase them.
                EOF
-               exit $?
+               return $?
        fi
 
        git am $git_am_opt --rebasing --resolvemsg="$resolvemsg" <"$GIT_DIR/rebased-patches"
@@ -68,7 +69,7 @@ fi
 if test 0 != $ret
 then
        test -d "$state_dir" && write_basic_state
-       exit $ret
+       return $ret
 fi
 
 move_to_original_branch