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
Setting the default editor for Git Pick one: Set core.editor in your Git config: git config –global core.editor “vim” Set the GIT_EDITOR environment variable: export GIT_EDITOR=vim Setting the default editor for all programs Set the standardized VISUAL and EDITOR environment variables*: export VISUAL=vim export EDITOR=”$VISUAL” NOTE: Setting both is not necessarily needed, but some programs … Read more
You can use –allow-unrelated-histories to force the merge to happen. The reason behind this is that default behavior has changed since Git 2.9: “git merge” used to allow merging two branches that have no common base by default, which led to a brand new history of an existing project created and then get pulled by … Read more
This answer only applies to Git version 1.x. For Git version 2.x, see other answers. Summary: git add -A stages all changes git add . stages new files and modifications, without deletions (on the current directory and its subdirectories). git add -u stages modifications and deletions, without new files Detail: git add -A is equivalent … Read more
You can use: git add –patch <filename> or for short: git add -p <filename> Git will break down your file into what it thinks are sensible “hunks” (portions of the file). It will then prompt you with this question: Stage this hunk [y,n,q,a,d,/,j,J,g,s,e,?]? Here is a description of each option: y stage this hunk for … Read more
Preferred Way (because it’s a plumbing command; meant to be programmatic): $ git diff-tree –no-commit-id –name-only -r bd61ad98 index.html javascript/application.js javascript/ie6.js Another Way (less preferred for scripts, because it’s a porcelain command; meant to be user-facing) $ git show –pretty=”” –name-only bd61ad98 index.html javascript/application.js javascript/ie6.js The –no-commit-id suppresses the commit ID output. The –pretty argument … Read more
To display only the name of the current branch you’re on: git rev-parse –abbrev-ref HEAD Reference: Show just the current branch in Git
First, create a new local branch and check it out: git checkout -b <branch-name> The remote branch is automatically created when you push it to the remote server: git push <remote-name> <branch-name> <remote-name> is typically origin, which is the name which git gives to the remote you cloned from. Your colleagues may then simply pull … Read more