git remote add coworker git://path/to/coworkers/repo.git git fetch coworker git checkout –track coworker/foo This will setup a local branch foo, tracking the remote branch coworker/foo. So when your co-worker has made some changes, you can easily pull them: git checkout foo git pull Response to comments: Cool 🙂 And if I’d like to make my own … Read more
What have you tried with git fsck ? see this SO question : Recover files that were added to the index but then removed by a git reset The general answer is : the sequence of instructions you typed has removed the file from tracking (and from the disk), there is no guarantee that the … Read more
Also, If you’ve never used heroku before on the other machine, you’ll need to do a few more things first: $ gem install heroku $ heroku login [then enter your credentials] $ heroku keys:add [path to keyfile] Now you can clone the remote repository: $ git clone [email protected]:<heroku_app>.git <local_directory>
If you mean you want the pull to overwrite local changes, doing the merge as if the working tree were clean, well, clean the working tree: git reset –hard git pull If there are untracked local files you could use git clean to remove them. git clean -f to remove untracked files -df to remove … Read more
The Short Answer As long as you’re doing a fast-forward merge, then you can simply use git fetch <remote> <sourceBranch>:<destinationBranch> Examples: # Merge local branch foo into local branch master, # without having to checkout master first. # Here `.` means to use the local repository as the “remote”: git fetch . foo:master # Merge … Read more
As Julian said see https://confluence.atlassian.com/display/FISHKB/Git+indexing+fails+due+to+bad+pack+header It really can be a memory issue, and to make sure we don’t lose the solution here it is: git config –global pack.windowMemory “100m” git config –global pack.SizeLimit “100m” git config –global pack.threads “1”
Here is a slightly easier method I just came up with when researching this: git fetch {remote} git checkout FETCH_HEAD — {file}
Follow the steps to setup SSH keys here: https://help.github.com/articles/generating-ssh-keys OR git remote add origin https://{username}:{password}@github.com/{username}/project.git Update: If you get “fatal: remote origin already exists.” then you have to use set-url: git remote set-url origin https://{username}:{password}@github.com/{username}/project.git
It should be pretty obvious from your question that you’re actually just asking about the difference between git merge and git rebase. So let’s suppose you’re in the common case – you’ve done some work on your master branch, and you pull from origin’s, which also has done some work. After the fetch, things look … Read more
In git 1.7.10, the git developers decided merge commits could be made too easily. As explained in this blog post, forcing the interactive commit message behavior should make those commit messages more detailed and could reduce the overall frequency of unnecessary merges. You can use the –no-edit flag to avoid this behavior, but, well, don’t. … Read more