I guess MERGE_HEAD is only present when a merge is in progress which also is the case when I am resolving conflicts. Correct. Git knows that a git merge is happening (and has not yet finished) because that file exists. (That there are, or at least were, conflicts is usually how you got there. You may or may not have resolved … Read more
I have presented git restore (which is still marked as “experimental”) in “How to reset all files from working directory but not from staging area?“, with the recent Git 2.23 (August 2019). It helps separate git checkout into two commands: one for files (git restore), which can cover git reset cases. one for branches (git … Read more
Another quicker way is: You don’t need to include –include-untracked if you don’t want to be thorough about it. After that, you can drop that stash with a git stash drop command if you like.
I have two local git repositories, both pointing to the same remote repository. In one git repository, if I do git format-patch 1, how can I apply that patch to the other repository?
This GitPro page does summarize the consequence of a git submodule update nicely When you run git submodule update, it checks out the specific version of the project, but not within a branch. This is called having a detached head — it means the HEAD file points directly to a commit, not to a symbolic … Read more
During git rebase origin/development the following error message is shown from Git: My Git version is 2.9.0. It used to work fine in the previous version. How can I continue this rebase allowing unrelated histories with the forced flag introduced in the new release?
How do we merge the master branch into the feature branch? Easy: There is no point in forcing a fast forward merge here, as it cannot be done. You committed both into the feature branch and the master branch. Fast forward is impossible now. Have a look at GitFlow. It is a branching model for … Read more
Use git rebase -i <after-this-commit> and replace “pick” on the second and subsequent commits with “squash” or “fixup”, as described in the manual. In this example, <after-this-commit> is either the SHA1 hash or the relative location from the HEAD of the current branch from which commits are analyzed for the rebase command. For example, if … Read more
git-clean – Remove untracked files from the working tree Synopsis Description Cleans the working tree by recursively removing files that are not under version control, starting from the current directory. Normally, only files unknown to Git are removed, but if the -x option is specified, ignored files are also removed. This can, for example, be … Read more
If another_branch already exists locally and you are not on this branch, then git checkout another_branch switches to the branch. If another_branch does not exist but origin/another_branch does, then git checkout another_branch is equivalent to git checkout -b another_branch origin/another_branch; git branch -u origin/another_branch. That’s to create another_branch from origin/another_branch and set origin/another_branch as the … Read more