On Sat, 20 Oct 2012 21:40:03 +0200 Herman van Rink <rink@xxxxxxxxxxx> wrote: > On 10/19/2012 03:21 PM, Yann Dirson wrote: > > As the examples in git-subtree.txt show, the synopsis in the same file should > > surely get a patch along the lines of: > > > > -'git subtree' add -P <prefix> <commit> > > +'git subtree' add -P <prefix> <repository> <commit> > > > > Failure to specify the repository (by just specifying a local commit) fails with > > the cryptic: > > > > warning: read-tree: emptying the index with no arguments is deprecated; use --empty > > fatal: just how do you expect me to merge 0 trees? > > > > > > Furthermore, the doc paragraph for add, aside from mentionning <repository>, also > > mentions a <refspec> which the synopsis does not show either. > > > > > > As a sidenote it someone wants to do some maintainance, using "." as repository when > > the branch to subtree-add is already locally available does not work well either > > (fails with "could not find ref myremote/myhead"). > > > > The version of subtree in contrib is rather out-dated unfortunately. > > I've collected a bunch of patches in > https://github.com/helmo/git/tree/subtree-updates Ah, it's nice to see subtree updates. Any plans to get them merged anytime soon ? I guess you may want to rebase the patches from https://github.com/helmo/git-subtree, the subtree-updates patch looks like a "subtree merge --squash" result, and is not really suitable for reviewing on the list. > The documentation issue is also fixed in there. > -- Yann Dirson - Bertin Technologies -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html