After trolling the waves of the IRC world, someone gave a great solution: git cherry-pick SHA1 –no-commit git add –patch Hopefully that helps anyone else with the same question! EDIT: OK, maybe it isn’t quite that simple. Here are the full steps: First you have to be in your repository, do the necessary cd-ing to … Read more
You could do this fairly simply with refspecs. git pull origin git diff @{1}.. That will give you a diff of the current branch as it existed before and after the pull. Note that if the pull doesn’t actually update the current branch, the diff will give you the wrong results. Another option is to … Read more
Well, I’m a former svn user too, and now use git for all my projects. When using git, you should change the way of thinking from the client-server architecture that’s used in svn. In svn, every change needs a connection with server. Using git, your repo is in the working directory. You don’t need a … Read more
git reset –hard ORIG_HEAD From the git reset man page (if you just did the pull): Undo a merge or pull $ git pull (1) Auto-merging nitfol CONFLICT (content): Merge conflict in nitfol Automatic merge failed; fix conflicts and then commit the result. $ git reset –hard (2) $ git pull . topic/branch (3) Updating … Read more
You can enable the option “Use credential helper” in Android Studio’s Preferences menu. The option is located at Preferences -> Version Control -> Git
Five possibilities exist to set up a repository for pull from: local filesystem: git clone /path/to/repo or git clone file://path/to/repo. Least work if you have networked filesystem, but not very efficient use of network. (This is almost exactly solution proposed by Joakim Elofsson) HTTP protocols: git clone http://example.com/repo. You need any web server, and you … Read more
Git already only pulls the current branch. If you have branch set up as a tracking branch, you do not need to specify the remote branch. git branch –set-upstream localbranch reponame/remotebranch will set up the tracking relationship. You then issue git pull [–rebase] and only that branch will be updated. Of course, all remote tracking … Read more
If Mr. Orange doesn’t mind losing his changes, he can fetch from the server, then checkout the the branch: git checkout A to get onto his local A branch. Then, assuming the remote is named “origin”, reset your local branch in favor of the remote branch: git reset –hard origin/A If he is concerned with … Read more
Those steps should be able to be shortened down to: hg pull hg update -r MY_BRANCH -C The -C flag tells the update command to discard all local changes before updating. However, this might still leave untracked files in your repository. It sounds like you want to get rid of those as well, so I … Read more
The quick way git branch –merged | grep -v “\*” | xargs -n 1 git branch -d NB: if you’re not on master, this has the potential to delete the branch. Keep reading for the “better way”. Make sure we keep master You can ensure that master, or any other branch for that matter, doesn’t … Read more