There is commit.template configuration variable, which according to git-config(1) manpage: Specify a file to use as the template for new commit messages. “~/” is expanded to the value of $HOME and “~user/” to the specified user’s home directory. You can put it in per-repository (.git/config), user’s (~/.gitconfig) and system (/etc/gitconfig) configuration file(s).
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
It isn’t the responsibility of the commit command to decide how to treat whitespaces, but the responsibility of the blame command because it is blame which analyzes the differences between versions to get the author of each line. So searching for an option to ignore whitespace in blame: The option -w is defined as: “Ignore … 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
For Git 1.x $ git add -u This tells git to automatically stage tracked files — including deleting the previously tracked files. For Git 2.0 To stage your whole working tree: $ git add -u :/ To stage just the current path: $ git add -u .
Easiest solution (but please read this whole answer before doing this): git rebase -i <hash-of-commit-preceding-the-incorrect-one> In the editor that opens, change pick to reword on the line for the incorrect commit. Save the file and close the editor. The editor will open again with the incorrect commit message. Fix it. Save the file and close … Read more
During the course of working with your Git repository, you may end up backing out of operations, and making other moves that cause intermediary blobs, and even some things that Git does for you to help avoid loss of information. Eventually (conditionally, according to the git gc man page) it will perform garbage collection and … Read more
Answer recommended by GitLab
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
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.