You can revert individual commits with: git revert <commit_hash> This will create a new commit which reverts the changes of the commit you specified. Note that it only reverts that specific commit, and not commits that come after that. If you want to revert a range of commits, you can do it like this: git … Read more
From August 13, 2021, GitHub is no longer accepting account passwords when authenticating Git operations. You need to add a PAT (Personal Access Token) instead, and you can follow the below method to add a PAT on your system. Create Personal Access Token on GitHub From your GitHub account, go to Settings => Developer Settings … Read more
If you haven’t yet commited the changes, then: git diff > mypatch.patch But sometimes it happens that part of the stuff you’re doing are new files that are untracked and won’t be in your git diff output. So, one way to do a patch is to stage everything for a new commit (git add each … Read more
No need to stash. Update 2020 / Git 2.23 Git 2.23 adds the new switch subcommand, in an attempt to clear some of the confusion caused by the overloaded usage of checkout (switching branches, restoring files, detaching HEAD, etc.) Starting with this version of Git, replace the git checkout command below with: git switch -c … Read more
You’re in the less program, which makes the output of git log scrollable. Type q to exit this screen. Type h to get help. If you don’t want to read the output in a pager and want it to be just printed to the terminal define the environment variable GIT_PAGER to cat or set core.pager … Read more
You can review the differences with a: git log HEAD..origin/master before pulling it (fetch + merge) (see also “How do you get git to always pull from a specific branch?”) When you have a message like: “Your branch and ‘origin/master’ have diverged, # and have 1 and 1 different commit(s) each, respectively.” , check if … Read more
You can run these two commands: # Revert changes to modified files. git reset –hard # Remove all untracked files and directories. # ‘-f’ is force, ‘-d’ is remove directories. git clean -fd
Example: git tag -a v1.2 9fceb02 -m “Message here” Where 9fceb02 is the beginning part of the commit id. You can then push the tag using git push origin v1.2. You can do git log to show all the commit id’s in your current branch. There is also a good chapter on tagging in the … Read more
The problem is that git push assumes that remote branch can be fast-forwarded to your local branch, that is that all the difference between local and remote branches is in local having some new commits at the end like that: Z–X–R <- origin/some-branch (can be fast-forwarded to Y commit) \ T–Y <- some-branch When you … Read more
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