Always ensure all parent .mrconfig files are loaded

[code/myrepos.git] / lib / git-subtree

diff --git a/lib/git-subtree b/lib/git-subtree
index 45b048e08b1e88d91e272a9685e0cd5edbb31f95..3943924ac397b21ec57f3312dc743cdfa6302310 100644 (file)
--- a/lib/git-subtree
+++ b/lib/git-subtree
@@ -1,5 +1,9 @@
 # Add support for Avery Pennarun's git-subtree
 #
 # Add support for Avery Pennarun's git-subtree
 #

+# To make mr use this file, add a line like this inside the [DEFAULT]
+# section of your ~/.mrconfig
+#include = cat /usr/share/mr/git-subtree
+#

 # Example:
 #
 # [repo]
 # Example:
 #
 # [repo]


@@ -33,7 +37,7 @@ lib =
                git subtree push "$@"
        }
 
                git subtree push "$@"
        }
 

-git_subtree_status = git status .
+git_subtree_status = git status -s "$@" . || true

 git_subtree_commit = git add . && git commit "$@" && git_subtree_push
 git_subtree_record = git add . && git commit "$@"
 git_subtree_diff = git diff .
 git_subtree_commit = git add . && git commit "$@" && git_subtree_push
 git_subtree_record = git add . && git commit "$@"
 git_subtree_diff = git diff .