From: Benoit SIGOURE Date: Sat, 28 Jul 2007 17:33:40 GMT Subject: Re: git-svn rebase screwing up commit messages Message-ID: <9B05AC3D-F791-4489-B523-C1392E480191@lrde.epita.fr> In-Reply-To: <7vodhwptba.fsf@assigned-by-dhcp.cox.net> On Jul 28, 2007, at 3:10 PM, Junio C Hamano wrote: > Sean writes: > >>> Do you mean by "my commits in Git" a commit you created with git >>> in your git repository? >> >> Tested this here (rc3.24.g83b3d) and can confirm the reported >> problem. >> After making a commit in git and then running "git svn rebase" to >> receive updates from the svn repo, the rebased commit has a borked >> description (multi-lined commit message appears all on one line). > > In short, your original commit log message is broken. > > The recommended convention for commit messages is to start it > with a single line that describes what it does, followed by a > blank line (i.e. the first paragraph consists of a single line), > followed by a longer explanation of why the change brought by > the commit is a good thing. > Hi people, thanks for the quick and complete replies. As a user, I do not expect git-rebase to change my commit message. I was aware of this convention in Git, but it looks like it's more than just a convention. This trap should either be fixed (your patch works for me) or it should be clearly stated in the documentation that commit messages must really be formatted according to the convention. Personally I expected Git to keep the 1st line of my commit message as the "short version" (which is what git log and the like do ATM) and although I don't leave a blank line between the 1st line and the rest of the message, the 1st line is always the sentence that can be used as a short version of the commit message. Cheers, -- Benoit Sigoure aka Tsuna EPITA Research and Development Laboratory