A common cause is cloning using the default (HTTPS) instead of SSH. You can correct this by going to your repository, clicking “Clone or download”, then clicking the “Use SSH” button above the URL field and updating the URL of your origin remote like this: git remote set-url origin git@github.com:username/repo.git You can check if you … Read more
Update 2: I’ve posted an improved version of this answer to the Visualizing branch topology in Git question, since it’s far more appropriate there. That version includes lg3, which shows both the author and committer info, so you really should check it out. Leaving this answer for historical (& rep, I’ll admit) reasons, though I’m … Read more
To search for commit content (i.e., actual lines of source, as opposed to commit messages and the like), you need to do: git grep <regexp> $(git rev-list –all) git rev-list –all | xargs git grep <expression> will work if you run into an “Argument list too long” error. If you want to limit the search … Read more
git pull -s recursive -X theirs <remoterepo or other repo> Or, simply, for the default repository: git pull -X theirs If you’re already in conflicted state… git checkout –theirs path/to/file
Use the –sort=-committerdate option of git for-each-ref; Also available since Git 2.7.0 for git branch: Basic Usage: git for-each-ref –sort=-committerdate refs/heads/ # Or using git branch (since version 2.7.0) git branch –sort=-committerdate # DESC git branch –sort=committerdate # ASC Result: Advanced Usage: git for-each-ref –sort=committerdate refs/heads/ –format=”%(HEAD) %(color:yellow)%(refname:short)%(color:reset) – %(color:red)%(objectname:short)%(color:reset) – %(contents:subject) – %(authorname) (%(color:green)%(committerdate:relative)%(color:reset))” … Read more
A shortcut, which doesn’t depend on remembering the syntax for git branch –set-upstream 1 is to do: git push -u origin my_branch … the first time that you push that branch. Or, to push to the current branch from a branch of the same name (handy for an alias): git push -u origin HEAD You … Read more
What you are trying to do is called a sparse checkout, and that feature was added in Git 1.7.0 (Feb. 2012). The steps to do a sparse clone are as follows: mkdir <repo> cd <repo> git init git remote add -f origin <url> This creates an empty repository with your remote, and fetches all objects … Read more
You can use git show with a path from the root of the repository (./ or ../ for relative pathing): $ git show REVISION:path/to/file Replace REVISION with your actual revision (could be a Git commit SHA, a tag name, a branch name, a relative commit name, or any other way of identifying a commit in … Read more
git checkout master # first get back to master git checkout experiment — app.js # then copy the version of app.js # from branch “experiment” See also git how to undo changes of one file? Update August 2019, Git 2.23 With the new git switch and git restore commands, that would be: git switch master … Read more
git remote prune origin prunes tracking branches not on the remote. git branch –merged lists branches that have been merged into the current branch. xargs git branch -d deletes branches listed on standard input. Be careful deleting branches listed by git branch –merged. The list could include master or other branches you’d prefer not to … Read more