summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-01-03 10:29:29 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-01-03 10:29:29 -0800
commitb81827b6b642da698e5d32fb54d74687dcf223cc (patch)
tree0fdc7e9c2b8d2d4981df7c366c0f888ba66db5e8 /contrib
parentMerge branch 'as/test-tweaks' (diff)
parentgit-subtree: fix typo in manpage (diff)
downloadtgif-b81827b6b642da698e5d32fb54d74687dcf223cc.tar.xz
Merge branch 'ms/subtree-fixlets'
* ms/subtree-fixlets: git-subtree: fix typo in manpage git-subtree: ignore git-subtree executable
Diffstat (limited to 'contrib')
-rw-r--r--contrib/subtree/.gitignore1
-rw-r--r--contrib/subtree/git-subtree.txt2
2 files changed, 2 insertions, 1 deletions
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
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 <prefix> supplied
+ Does a 'split' (see below) using the <prefix> 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.