You can have nested git repos: The parent repo will simply ignore nested repo. jleedev comments and illustrates with this gist script that the parent repo would track the nested repo state through a gitlink. (gitlink = SHA-1 of the object refering to a commit in another repository. Git links can only be specified by … Read more
Branches are stored as files containing the SHA they point to. Try deleting the file for this branch, named localbranch, from the .git/refs/head/ directory within your project: rm .git/refs/heads/localbranch
Starting with X stable / a—b—c—d—e—f—g development You can use the following steps to copy the last commit from your development branch to your stable branch: git checkout development@{0} # get working tree from “development”, detach HEAD git reset –soft stable # reposition detached HEAD on “stable” git commit # enter the appropriate commit message … Read more
Disclaimer: The source control system I understand best is SVN. So that colors my usage of terms such as repo, checkout, etc. Also, I use Accurev on a daily basis, but I tend not to venture far from the core concepts that I feel I have a firm grasp of. One sentence (with an asterisk): … Read more
It is absolutely possible – what you probably want to do is create a “bare” git repository in folder Y (git init –bare) and then add that file location as a remote: git remote add Y file:///path/to/Y I assume GitHub for Mac or Tower for Mac would handle this like any other remote.
The security options can be accessed for the repositories at 1. Code->Explorer 2. Select a repo form the Explorer 3. At the details of the repository, you should click to the name of the repository beside the explorer. 4. Select the Manage repositories… menu Here you can configure the rights of each contributor groups and … Read more
You should set vim to not detach from the shell and be in the foreground. You can do this with the following command: git config –global core.editor vim -f From the man: -f Foreground. For the GUI version, Vim will not fork and detach from the shell it was started in. On the Amiga, Vim … Read more
Okay, so. We can see from the second error message that the corrupt object which you moved was a commit. (HEAD was pointing to it!) Unfortunately, this means that it’s hard to manually repair it. (By “hard” I mean likely impossible unless you can remember exactly what the commit message was and what time you … Read more
After extensively looking at git help rev-parse and experimenting around, I found this piece of information: <rev1>..<rev2> Include commits that are reachable from <rev2> but exclude those that are reachable from <rev1>. When either <rev1> or <rev2> is omitted, it defaults to HEAD. <rev1>…<rev2> Include commits that are reachable from either <rev1> or <rev2> but … Read more
You can omit creating merge commits, by using rebase instead of merge. As @Dougal said, if you do git fetch, you can execute git rebase afterwards to change the base of your changes to the fetched HEAD. Usually you create those unwanted merge commits, by pulling from remote repository. In that case you can add … Read more