Update 2016: with git 2.8 (March 2016), you can simply use: git config –list –show-origin And with Git 2.26 (Q1 2020), you can add a –show-scope option git config –list –show-origin –show-scope You will see which config is set where. See “Where do the settings in my Git configuration come from?” As Stevoisiak points out … Read more
You can think of the HEAD as the “current branch”. When you switch branches with git checkout, the HEAD revision changes to point to the tip of the new branch. You can see what HEAD points to by doing: cat .git/HEAD In my case, the output is: $ cat .git/HEAD ref: refs/heads/master It is possible … Read more
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
Run this from the branch where you want the file to end up: git checkout otherbranch myfile.txt General formulas: git checkout <commit_hash> <relative_path_to_file_or_dir> git checkout <remote_name>/<branch_name> <file_or_dir> Some notes (from comments): Using the commit hash, you can pull files from any commit This works for files and directories Overwrites the file myfile.txt and mydir Wildcards … Read more
See the official GitHub’s “Collection of useful .gitignore templates”. The .gitignore for Visual Studio can be found here: https://github.com/github/gitignore/blob/main/VisualStudio.gitignore
If you aren’t totally sure what you mean by “uncommit” and don’t know if you want to use git reset, please see “Revert to a previous Git commit”. If you’re trying to understand git reset better, please see “Can you explain what “git reset” does in plain English?”. If you know you want to use … Read more
‘git cherry-pick‘ should be your answer here. Apply the change introduced by an existing commit. Do not forget to read bdonlan’s answer about the consequence of cherry-picking in this post: “Pull all commits from a branch, push specified commits to another”, where: A—–B——C \ \ D becomes: A—–B——C \ \ D—–C’ The problem with this … Read more
The –no-ff flag prevents git merge from executing a “fast-forward” if it detects that your current HEAD is an ancestor of the commit you’re trying to merge. A fast-forward is when, instead of constructing a merge commit, git just moves your branch pointer to point at the incoming commit. This commonly occurs when doing a … Read more
Instead of removing and re-adding, you can do this: git remote set-url origin git://new.url.here See this question: How to change the URI (URL) for a remote Git repository? To remove remote use this: git remote remove origin
First fetch the new master from the upstream repository, then rebase your work branch on that: git fetch origin # Updates origin/master git rebase origin/master # Rebases current branch onto origin/master Update: Please see Paul Draper’s answer for a more concise way to do the same – recent Git versions provide a simpler way to … Read more