Merge branch 'kb/maint-filter-branch-disappear'

diff --git a/git-am.sh b/git-am.sh
index 2ecebc45a93784f1ca377941cd9b96569b3ade1c..a2c6fea47af1e4616bc549f26f3fe1b364841abe 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
@@ -2,6 +2,7 @@
 #
 # Copyright (c) 2005, 2006 Junio C Hamano
 
+SUBDIRECTORY_OK=Yes
 OPTIONS_KEEPDASHDASH=
 OPTIONS_SPEC="\
 git-am [options] <mbox>|<Maildir>...
@@ -25,6 +26,7 @@ skip            skip the current patch"
 . git-sh-setup
 set_reflog_action am
 require_work_tree
+cd_to_toplevel
 
 git var GIT_COMMITTER_IDENT >/dev/null || exit