From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 14 Feb 2013 18:28:26 +0000 (-0800)
Subject: Merge branch 'dg/subtree-fixes'
X-Git-Tag: v1.8.2-rc0~25
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/260adc87b3d6c00650ba2dd493abd9a6603ca4f1?ds=inline;hp=-c

Merge branch 'dg/subtree-fixes'

contrib/subtree updates, but here are only the ones that looked
ready.  The remainder of the patches will have another day.

* dg/subtree-fixes:
contrib/subtree: make the manual directory if needed
contrib/subtree: honor DESTDIR
contrib/subtree: fix synopsis
contrib/subtree: better error handling for 'subtree add'
contrib/subtree: use %B for split subject/body
contrib/subtree: remove test number comments
---

260adc87b3d6c00650ba2dd493abd9a6603ca4f1
diff --combined contrib/subtree/git-subtree.txt
index c5bce41ac7,89614e5bb9..7ba853eeda
--- a/contrib/subtree/git-subtree.txt
+++ b/contrib/subtree/git-subtree.txt
@@@ -9,7 -9,8 +9,8 @@@ git-subtree - Merge subtrees together a
  SYNOPSIS
  --------
  [verse]
- 'git subtree' add   -P <prefix> <commit>
+ 'git subtree' add   -P <prefix> <refspec>
+ 'git subtree' add   -P <prefix> <repository> <refspec>
  'git subtree' pull  -P <prefix> <repository> <refspec...>
  'git subtree' push  -P <prefix> <repository> <refspec...>
  'git subtree' merge -P <prefix> <commit>
@@@ -93,7 -94,7 +94,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.