commit-message

After I type in git commit -a a text editor pops up and I type in my comment. What buttons do I have to press after typing in the comment, to get it to move to the next stage of actually committing? I'm using mysysGit on Windows with the default setup. Depends on the text editor you are using. Git chooses the editor specified in the environment variable "EDITOR." On Linux systems this is usually either Vi or Nano. Figure out which it is and then refer to the documentation for the appropriate editor. Save the file and exit your editor. try this: git add file-name git commit -m "here goes my

This question already has answers here : How to modify a specified commit? (15 answers) Let's say I have 3 unpushed commits. Now I want to change the commit message of the first or second commit (changing them for the third one is simple using git commit --amend ). How to do that? VonC To rebound on the sub-question: is there a git commit --amend for a previous commit (and not just the last one), you could try something like (not tested yet, but Colin O'Dell mentions in the comments having written a script for it colinodell/git-amend-old ): git checkout -b tmp git reset --hard HEAD~2 git

Say I run git pull and there is a conflict that git cannot automatically merge. After I manually merge the changes, and run git commit , should I leave the Conflicts: section that git generates in the commit (as a record that those files were manually merged), or removed it (as the conflict is not being committed)? I'm never sure what best practice is - is the warning there to make sure you fix the conflicts, or to be actually logged in the commit message? This seems like a personal opinion type of question, so I'll answer with my opinion [-; I leave the Conflicts section alone as a reminder

I am trying to customize the format for git log . I want all commits to be shown in one line. Each line should only show the first line of the commit message. I found out that git log --pretty=short should do the trick but on my computer it shows the full log as git log does (besides the time stamp). Further, I tried to use the placeholders as defined in the man page . Though, I could not find a command to shorten the log message. I tried this line git log --pretty=format:'%h : %s' which shows the shorted hash %h and the full message %s in one line. I am using git version 1.7.3.1.msysgit.0 on

Is it possible to trigger a Hudson/Jenkins build only when a certain string appears in a commit-message? For instance, I want to trigger a build that rolls out my application to the dev environment by writing a commit message like: MYPROJECT-123 Fixed NPE in MyClass.java #deploy:DEV The general idea is described in this great talk on Continuos Deployment but I couldn't find any information on how to do this in Hudson. I would prefer to have this behavior in Hudson itself and not in an external system like commit-hooks or web-hooks. I don't know of an out of the box way you can parse the SCM

As Git user I regular come across the situation, that I need to rework one or more commits in a way which do not fit into --amend or rebase -i with fixup commits. Typically I would do something like git reset HEAD~1 # hack, fix, hack git commit -a # argh .. do I need to retype my message? I take sensible composed commit messages quite serious. They typically contain larger text with references & justifications for the change. Until now, I'm quite annoyed on the lengthy process to recover my old commit message via an unsorted git reflog , git log and copy & paste process. Is there a better to

This question already has an answer here: Git Commit Messages : 50/72 Formatting 5 answers I find myself managing very many files (over 60 but below 70) and my commit messages so far follow this pattern: when I have added something like on layout.css , my commit message is "added something on layout.css file" , and when I remove something, my commit message is "removed something from layout.css file" . Some files down the line, I look at my commits feed and added... and removed... messages dominate. Sometimes I don't remember what I removed or what I added in layout.css since I make so many