From the git-branch manual page: git branch –contains <commit> Only list branches which contain the specified commit (HEAD if not specified). Implies –list. git branch -r –contains <commit> Lists remote tracking branches as well (as mentioned in user3941992’s answer below) that is “local branches that have a direct relationship to a remote branch”. As noted … Read more
Running git pull performs the following tasks, in order: git fetch git merge The merge step combines branches that have been setup to be merged in your config. You want to undo the merge step, but probably not the fetch (doesn’t make a lot of sense and shouldn’t be necessary). To undo the merge, use … Read more
If I understand the question correctly, you simply want to “undo” the git add that was done for that file. If you need to remove a single file from the staging area, use git reset HEAD — <file> If you need to remove a whole directory (folder) from the staging area, use git reset HEAD … Read more
Pat Notz is correct. You can get the commit back so long as it’s been within a few days. git only garbage collects after about a month or so unless you explicitly tell it to remove newer blobs. $ git init Initialized empty Git repository in .git/ $ echo “testing reset” > file1 $ git … Read more
This works for both git log and gitk – the 2 most common ways of viewing history. You don’t need to use the whole name: git log –author=”Jon” will match a commit made by “Jonathan Smith” git log –author=Jon and git log –author=Smith would also work. The quotes are optional if you don’t need any … Read more
Create a users file (i.e. users.txt) for mapping SVN users to Git: user1 = First Last Name <email@address.com> user2 = First Last Name <email@address.com> … You can use this one-liner to build a template from your existing SVN repository: svn log -q | awk -F ‘|’ ‘/^r/ {gsub(/ /, “”, $2); sub(” $”, “”, $2); … Read more
It’s explained in great detail in the docs, but I’ll try to summarize: matching means git push will push all your local branches to the ones with the same name on the remote. This makes it easy to accidentally push a branch you didn’t intend to. simple means git push will push only the current … Read more
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
You can use git checkout — file You can do it without the — (as suggested by nimrodm), but if the filename looks like a branch or tag (or other revision identifier), it may get confused, so using — is best. You can also check out a particular version of a file: git checkout v1.2.3 … Read more
From linux symlink manual (assuming you are in Linux): A symbolic link is a special type of file whose contents are a string that is the pathname of another file, the file to which the link refers. (The contents of a symbolic link can be read using readlink(2).) So a symbolic link is one more … Read more