NOTE: This answer changes SHA1s, so take care when using it on a branch that has already been pushed. If you only want to fix the spelling of a name or update an old email, Git lets you do this without rewriting history using .mailmap. See my other answer. Using Rebase First, if you haven’t … Read more
Use git diff. git diff [<options>] <commit>..<commit> [–] [<path>…] <commit> is a branch name, a commit hash, or a shorthand symbolic reference. Examples: git diff abc123..def567, git diff HEAD..origin/master. That will produce the diff between the tips of the two branches. If you’d prefer to find the diff from their common ancestor to test, you … Read more
Option A: git clone git@github.com:whatever folder-name Ergo, for right here use: git clone git@github.com:whatever . Option B: Move the .git folder, too. Note that the .git folder is hidden in most graphical file explorers, so be sure to show hidden files. mv /where/it/is/right/now/* /where/I/want/it/ mv /where/it/is/right/now/.* /where/I/want/it/ The first line grabs all normal files, the … Read more
Use git rebase. For example, to modify commit bbc643cd, run: $ git rebase –interactive ‘bbc643cd^’ Please note the caret ^ at the end of the command, because you need actually to rebase back to the commit before the one you wish to modify. In the default editor, modify pick to edit in the line mentioning … Read more
Update: Using Git Switch All of the information written below was accurate, but a new command, git switch has been added that simplifies the effort. If daves_branch exists on the remote repository, but not on your local branch, you can simply type: git switch daves_branch Since you do not have the branch locally, this will … Read more
To push a single tag: git push origin <tag_name> And the following command should push all tags (not recommended): # not recommended git push –tags
The problem is that Xcode Command-line Tools needs to be updated. Solution #1 Go back to your terminal and enter: xcode-select –install You’ll then receive the following output: xcode-select: note: install requested for command line developer tools You will then be prompted in a window to update Xcode Command Line tools. (which may take a … Read more
Cherry picking in Git means to choose a commit from one branch and apply it onto another. This is in contrast with other ways such as merge and rebase which normally apply many commits onto another branch. Make sure you are on the branch you want to apply the commit to. git switch master Execute … Read more
Since your pull was unsuccessful then HEAD (not HEAD^) is the last “valid” commit on your branch: git reset –hard HEAD The other piece you want is to let their changes over-ride your changes. Older versions of git allowed you to use the “theirs” merge strategy: git pull –strategy=theirs remote_branch But this has since been … Read more
Find the last commit that affected the given path. As the file isn’t in the HEAD commit, that previous commit must have deleted it. git rev-list -n 1 HEAD — <file_path> Then checkout the version at the commit before, using the caret (^) symbol: git checkout <deleting_commit>^ — <file_path> Or in one command, if $file … Read more