]> git.madduck.net Git - code/myrepos.git/blobdiff - lib/git-subtree

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

prep
[code/myrepos.git] / lib / git-subtree
index 45b048e08b1e88d91e272a9685e0cd5edbb31f95..3943924ac397b21ec57f3312dc743cdfa6302310 100644 (file)
@@ -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 .