From f228dade3df3b5ab6b6ef0fa3d8fbcf19b9adabc Mon Sep 17 00:00:00 2001 From: Michael Schubert Date: Sat, 22 Dec 2012 15:45:40 +0100 Subject: [PATCH 1/2] git-subtree: ignore git-subtree executable Signed-off-by: Michael Schubert Signed-off-by: Junio C Hamano --- contrib/subtree/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/subtree/.gitignore b/contrib/subtree/.gitignore index 7e77c9d022..91360a3d7f 100644 --- a/contrib/subtree/.gitignore +++ b/contrib/subtree/.gitignore @@ -1,4 +1,5 @@ *~ +git-subtree git-subtree.xml git-subtree.1 mainline From 248a8849fa649e7404192cec00635026604a6750 Mon Sep 17 00:00:00 2001 From: Michael Schubert Date: Sat, 22 Dec 2012 15:46:02 +0100 Subject: [PATCH 2/2] git-subtree: fix typo in manpage Signed-off-by: Michael Schubert Signed-off-by: Junio C Hamano --- contrib/subtree/git-subtree.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/subtree/git-subtree.txt b/contrib/subtree/git-subtree.txt index 0c44fda011..c5bce41ac7 100644 --- a/contrib/subtree/git-subtree.txt +++ b/contrib/subtree/git-subtree.txt @@ -93,7 +93,7 @@ pull:: repository. push:: - Does a 'split' (see above) using the supplied + Does a 'split' (see below) using the supplied and then does a 'git push' to push the result to the repository and refspec. This can be used to push your subtree to different branches of the remote repository.