Use 'pull' or 'merge' to merge local branches?
I have seen two different ways of merging local branches. git checkout master git merge new_feature git checkout master git pull . new_feature What is the difference, pros/cons? ...
git
In git, can you view the older commits applied to a file after it has been moved?
After I have moved a file in git (using git mv), looking at the log for that file only shows the commits including and after the move. Is there any way to view the commits applied to the file under its old name? In the example, below, I'd like to see commits b04033bdc44f1 and 8ca40d563ce5d in git log after I've done the move. $ git i...
Xcode Development + GitHub. What is the proper setup.
I am moving from years of Eclipse + CDT + Subclipse to Xcode with Github as my replacement for Subversion. I am new to Github and have not found a good howto for setting up a repository that knows how to play nice with and Xcode project. Can someone please walk me through the setup? Thanks in advance. -Doug ...
How to efficiently rebase and push a local git branch?
Hi, we're using a central git repository which I've cloned and I'm working on a local branch. When I want to make my changes available in the central repository, I have to issue the following commands (starting on mybranch): #Stash local changes not yet ready for checkin git stash #Make sure we have all changes from the central reposit...
Git checkout on a remote branch does not work.
My problem is related to: http://stackoverflow.com/questions/180064/fatal-git-error-when-switching-branch I try to fetch a remote branch with the command git checkout -b local-name origin/remote-name but I get this error message: fatal: git checkout: updating paths is incompatible with switching branches. Did you intend to checkout...
CruiseControl.NET and Git
It looks like there is no built-in support for Git in CruiseControl.NET. Anyone have suggestions on Git plug-ins, tips, or other advice on getting CruiseControl.NET with work with Git? ...
Question about git push
I've ran against a problem whith git push today. I tried to push a branch to the remote repository, but it gave an error. After some search, i've asked it on the git irc channel, and someone said that the syntax of the push was git push <remote> <localref>:<remoteref> Up until now, i just used git push which worked fine. But in th...
One commit back from FETCH_HEAD
When looking at the latest git commits, I know you can do git log -1..HEAD in order to look at the last commit before HEAD. What I'd like to do is along the same lines, but rather than looking one back from HEAD, I'd like to do it from FETCH_HEAD. Is there a way denoting this in the git log command? ...
Can third party hosts be trusted for closed-source/private source code management?
For many companies, their project's source code is very valuable to them -- theft of the source code could be very costly. Keeping source code tightly controlled on a local network is one way to help protect it. However, there are advantages to hosting source code externally, whether it is simply a subversion or git server hosted on dr...
git push current branch
I use the following command to push to my remote branch: git push origin sandbox If I say git push origin Does that push changes in my other branches too, or does it only update my current branch? (I have three branches: master, production and sandbox). (The git push documentation is not very clear about this, so I'd like to clari...
Git work flow with an inexpirenced member.
What would you suggest as a work flow when there is a inexperienced developer joins the team i have been using git for my projects now a new developer will join but he has not used any version control before. Project resides in github and i have no way of pulling directly with him. We are both behind firewalls. Should i create a branch ...
How to retrieve the hash for the current commit in Git?
I'm currently busy migrating away from the versioncontrol part of Team Foundation Server to Git. (Why I'm migrating away is a different story ;^) However, I would like to retain (for now) the ability to link Git changesets to workitems stored in TFS. I already wrote a tool (using a hook from Git) in which I can inject workitemidentifier...
Can I make git-svn import a Subversion repository which itself contains git repositories
I have a project in SVN which has a plugins folder. Several of the plugins folders are git repositories -- I added them to my plugins folder using git clone. This has been working well for me but now I'm looking to migrate my SVN repository to git using git-svn: git svn init http://path/to/my/repo --no-metadata git config svn.authors...
git equivalent to hg mq ?
Hi; I just started using git alongside mercurial to familiarize myself with git. I use the mq extension in mercurial extensively to manage local patches, and I'm looking for a git equivalent. Should I just use git branch? Or are there better ways to manage local patches that enable easily applying and removing the patches? Thanks, ...
Git is consistently deleting 2 directories from my repository, how can I troubleshoot this?
I don't expect someone to solve my problem, but I am not quite sure how to troubleshoot this. If I do a "git status", I get: # On branch master # Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # # deleted: app/controllers/application.rb # # Changed but not updated: # (use "git add <file>..." to upda...
Restore a deleted file in a Git repo
Say I'm in a Git repository. I delete a file and commit that change. I continue working and make some more commits. Then, I find I need to restore that file. I know I can checkout a file using git checkout HEAD^ foo.bar, but I don't really know when that file was deleted. What would be the quickest way to find the commit that deleted ...
How do you handle deploying rails applications with submodules?
I recently turned a couple of my plugins into submodules and realized that when you "git clone" a repository, the submodule directory will be empty. This makes sense for co-developers to initialize their submodules and update. However, when I deploy with capistrano the submodule code will obviously not be deployed which causes proble...
What does git do to files that are a symbolic link?
If I have a file or directory that is a symbolic link and I commit it to a git repo what happens to it? I would assume that it leaves it as a symbolic link until the file is deleted and then if you pull the file back from an old version it just creates a normal file. What does it do when I delete the file it references? Does it just co...
Is there a way to get to the git root directory in one command?
Mercurial has a way of getting to the root directory (that contains .hg) via hg root Is there something equivalent in git to get to the directory that contains the .git directory? ...
git-svn: ignore case of svn usernames from authorsfile?
I'm tracking a svn repository using git-svn and have an authorsfile to get real names for the committers. svn doesn't seem to care about the casing of usernames -- there are commits with username variations like username, Username and UserName which definitely belong to the same committer. Unfortunately git-svn respects casing, so I have...