From: Herman van Rink <[email protected]>
Signed-off-by: Paul Campbell <[email protected]>
Conflicts:
git-subtree.sh
---
contrib/subtree/git-subtree.sh | 1 +
contrib/subtree/git-subtree.txt | 4 ++++
2 files changed, 5 insertions(+)
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
index 84c90c7..4605203 100755
--- a/contrib/subtree/git-subtree.sh
+++ b/contrib/subtree/git-subtree.sh
@@ -15,6 +15,7 @@ git subtree pull --prefix=<prefix> <repository> <refspec...>
git subtree pull-all
git subtree push-all
git subtree push --prefix=<prefix> <repository> <refspec...>
+git subtree list
git subtree split --prefix=<prefix> <commit...>
git subtree diff --prefix=<prefix> [<repository> [<refspec>...]]
git subtree from-submodule --prefix=<prefix>
diff --git a/contrib/subtree/git-subtree.txt b/contrib/subtree/git-subtree.txt
index b485ab5..385bde8 100644
--- a/contrib/subtree/git-subtree.txt
+++ b/contrib/subtree/git-subtree.txt
@@ -15,6 +15,7 @@ SYNOPSIS
'git subtree' pull-all
'git subtree' push-all
'git subtree' push --prefix=<prefix> [<repository> [<refspec>...]]
+'git subtree' list
'git subtree' split --prefix=<prefix> <commit...>
'git subtree' from-submodule --prefix=<prefix>
'git subtree' prune
@@ -108,6 +109,9 @@ push::
push-all::
Perform a pull operation on all in .gittrees registered subtrees.
+list::
+ Show a list of the in .gittrees registered subtrees
+
split::
Extract a new, synthetic project history from the
history of the <prefix> subtree. The new history
--
1.8.2.rc1
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
