top button
Flag Notify
    Connect to us
      Site Registration

Site Registration

git-subtree manpage missing from git-manpages tarballs

+1 vote
390 views

The git-subtree manpage is currently missing from the git-manpages tarballs at https://code.google.com/p/git-core/.

For example, https://code.google.com/p/git-core/downloads/detail?name=git-manpages-1.8.5.1.tar.gz
does not include it.

A side effect of this is that "git help subtree" fails when using git installed from homebrew, because the homebrew recipe uses those tarballs as its source of documentation.

posted Dec 8, 2013 by Ahmed Patel

Share this question
Facebook Share Button Twitter Share Button LinkedIn Share Button

1 Answer

+1 vote

git-subtree and its documentation are in the contrib/subtree directory. contrib/subtree/Makefile includes rules to build a manpage for it.

If the homebrew rules are installing the git-subtree command from there, perhaps they could be tweaked to build the manpage, too. What do you think?

answer Dec 8, 2013 by Majula Joshi
Thanks - I guess git-manpages generally doesn't include bits from contrib then.

The homebrew recipe states:

 # We could build the manpages ourselves, but the build process depends
 # on many other packages, and is somewhat crazy, this way is easier.

So while I'm sure it's possible it sounds like the current process is preferred.
Similar Questions
+1 vote

I have a large Git project which I would like to dissect into subprojects with their own repositories. Git subtrees are ideal for this task: I first

  • create a branch with the contents of only one subfoldergit subtree split -P -b

and then

  • pull this branch into another repository.

For a transitional phase, I would like to have the subprojects read-only and sync them from master. The question is how to organize this. For every commit to master, I could of course perform the above procedure repeatedly for all subprojects, but this seems less then ideal since it does all the work all over again.

Is there a way to merge master into the subtree branches?

+2 votes

I am trying to use subtree instead of submodules to manage a project, but I don't know how to send the parent project alone. Let me explain my self.

We have a project split in a parent repository and some plug-in repositories. One can use the parent project alone or adding plugins with

"git subtree add --prefix=plugin-a https://github.com/my-project/plugin-a.git master"

After the development is ready, one can split and commit the changes in the plugin but I don't know how to commit the parent project without plugins.

+2 votes

I see over the last year (on the web and in this mailing list) there was some activity to extend subtree with a .gittrees file and push-all/pull-all commands.

Perhaps I missed it, but looking through the latest git code on the github mirror I can't find any reference to the .gittrees file or these commands.

Does anyone know the status of this feature? Was it decided that this was a bad idea and the feature has been rejected? Or is this a feature still "cooking"...which will likely make it into git mainline at some point?

I ask because I would like to use something like this to be able to keep a combined repository and separate project repositories in sync. Of course, if it was decided that this feature is fundamentally a bad idea then I will do something different.

Any pointers.

0 votes

I have a problem with an already committed file into my repo. This git repo was converted from svn to git some years ago. Last week I have change some lines in a file and I saw in the diff that it is marked as binary (it's a simple .cpp file). I think on the first commit it was detected as an utf-16 file (on windows). But no matter what I do I can't get it back to a "normal text" text file (git does not detect that), but I is now only utf-8. I also replace the whole content of the file with just 'a' and git say it's binary.

Is the only way to get it back to text-mode?:
* copy a utf-8 version of the original file
* delete the file
* make a commit
* add the old file as a new one

I think that will work but it will also break my history.

Is there a better way to get these behavior without losing history?

0 votes

When I update my branch from master it pulls down several files, including some sass files. When I compile, however, gulp alerts me that I am missing .scss files.

I tested this by creating a new fresh branch and running gulp sass. This time there were no errors and I saw the missing .scss had been brought in.

Would anyone know why, on update, I am only getting some of the files from master?

...