aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-01-08 11:17:10 -0800
committerJunio C Hamano <gitster@pobox.com>2013-01-08 11:17:10 -0800
commit4208fa5ce44a746edb582898dfa49b2bfa84dbcc (patch)
tree093354c1d443cd7cea62a58e057882e719686484 /contrib
parentb48b632cda2d8f74524c448027e867089ddcb44a (diff)
parent248a8849fa649e7404192cec00635026604a6750 (diff)
downloadgit-4208fa5ce44a746edb582898dfa49b2bfa84dbcc.tar.gz
git-4208fa5ce44a746edb582898dfa49b2bfa84dbcc.tar.xz
Merge branch 'ms/subtree-fixlets' into maint
* 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 7e77c9d02..91360a3d7 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 0c44fda01..c5bce41ac 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.