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
This is the new icon being used with Git for Windows 2.x. The website needs an update for that I guess but there are not many volunteers typically. The MINGW64 is the value from the MSYSTEM environment variable. This has been included in the bash prompt by setting PS1 in the /etc/bash.bashrc file. You can … Read more
This question already has answers here: fatal: Not a git repository (or any of the parent directories): .git Git: Receiving “fatal: Not a git repository” when attempting to remote add a Git repo When I tried to push an existing repository on github.com, and it when I entered the command the website prompted me to … Read more
If you want to rename a branch while pointed to any branch, do: If you want to rename the current branch, you can do: If you want to push the local branch and reset the upstream branch: And finally if you want to Delete the remote branch: A way to remember this is -m is for “move” … Read more
Just do: or if you have a specific repo: This will delete your previous commit(s) and push your current one. It may not be proper, but if anyone stumbles upon this page, thought they might want a simple solution… Short flag Also note that -f is short for –force, so will also work.