The preference for present-tense, imperative-style commit messages comes from Git itself. From Documentation/SubmittingPatches in the Git repo: Describe your changes in imperative mood, e.g. “make xyzzy do frotz” instead of “[This patch] makes xyzzy do frotz” or “[I] changed xyzzy to do frotz”, as if you are giving orders to the codebase to change its … Read more
Sign-off is a requirement for getting patches into the Linux kernel and a few other projects, but most projects don’t actually use it. It was introduced in the wake of the SCO lawsuit, (and other accusations of copyright infringement from SCO, most of which they never actually took to court), as a Developers Certificate of … Read more
If you haven’t yet pushed your changes, you can also do a soft reset: git reset –soft HEAD^ This will revert the commit, but put the committed changes back into your index. Assuming the branches are relatively up-to-date with regard to each other, git will let you do a checkout into the other branch, whereupon … Read more
It’s not a Git error message, it’s the editor as git uses your default editor. To solve this: press “i” (i for insert) write your merge message press “esc” (escape) write “:wq” (write & quit) then press enter
I actually once pushed with –force and .git repository and got scolded by Linus BIG TIME. In general this will create a lot of problems for other people. A simple answer is “Don’t do it”. I see others gave the recipe for doing so anyway, so I won’t repeat them here. But here is a … Read more
Here’s the brute-force approach. It also removes the configuration of the repository. Note: This does NOT work if the repository has submodules! If you are using submodules, you should use e.g. interactive rebase Step 1: remove all history (Make sure you have a backup, this cannot be reverted) cat .git/config # note <github-uri> rm -rf … Read more
Maybe (from git commit man page): git commit –no-verify -m “commit message” ^^^^^^^^^^^ -n –no-verify This option bypasses the pre-commit and commit-msg hooks. See also githooks(5). As commented by Blaise, -n can have a different role for certain commands. For instance, git push -n is actually a dry-run push. Only git push –no-verify would skip … Read more
Since Git 1.7.9 you can also use git commit –amend –no-edit to get your result. Note that this will not include metadata from the other commit such as the timestamp or tag, which may or may not be important to you.
Just use git reset without the –hard flag: git reset HEAD~1 PS: On Unix based systems you can use HEAD^ which is equal to HEAD~1. On Windows HEAD^ will not work because ^ signals a line continuation. So your command prompt will just ask you More?.
Just include #xxx in your commit message to reference an issue without closing it. With new GitHub issues 2.0 you can use these synonyms to reference an issue and close it (in your commit message): fix #xxx fixes #xxx fixed #xxx close #xxx closes #xxx closed #xxx resolve #xxx resolves #xxx resolved #xxx You can … Read more