Re: Log messages beginning # and git rebase -i

Junio C Hamano gits...@pobox.com writes: Matthieu Moy matthieu@grenoble-inp.fr writes: Duy Nguyen pclo...@gmail.com writes: On Wed, Jul 29, 2015 at 12:48 AM, Matthieu Moy matthieu@grenoble-inp.fr wrote: If the user wants whatever she types in the resulting commit literally, there

Re: Log messages beginning # and git rebase -i

Matthieu Moy matthieu@grenoble-inp.fr writes: Then, as you say, it is up to the user to remove things that Git has added. Why would we ask the user to do this when we have a way to have the tool do it? The timeline of development, perhaps? I thought cleanup=scissors was a fairly recent

Re: Log messages beginning # and git rebase -i

Matthieu Moy matthieu@grenoble-inp.fr writes: Duy Nguyen pclo...@gmail.com writes: On Wed, Jul 29, 2015 at 12:48 AM, Matthieu Moy matthieu@grenoble-inp.fr wrote: If the user wants whatever she types in the resulting commit literally, there is the --cleanup=choice option, no? $

Re: Log messages beginning # and git rebase -i

Junio C Hamano gits...@pobox.com writes: OK. So the proposal on the table is that a backslash at the beginning of a line is stripped. Yes. Stripping part should look like this. Thanks. To make it work for things like git commit --amend, you would need to prefix any line that comes from

Re: Log messages beginning # and git rebase -i

On Wed, Jul 29, 2015 at 12:48 AM, Matthieu Moy matthieu@grenoble-inp.fr wrote: If the user wants whatever she types in the resulting commit literally, there is the --cleanup=choice option, no? $ GIT_EDITOR=touch git commit --cleanup=verbatim [detached HEAD 1b136a7] # Please enter the

Re: Log messages beginning # and git rebase -i

Thank you for looking into this. -- Ed Avis e...@waniasset.com -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: Log messages beginning # and git rebase -i

On Wed, Jul 29, 2015 at 7:17 PM, Matthieu Moy matthieu@grenoble-inp.fr wrote: Duy Nguyen pclo...@gmail.com writes: On Wed, Jul 29, 2015 at 12:48 AM, Matthieu Moy matthieu@grenoble-inp.fr wrote: If the user wants whatever she types in the resulting commit literally, there is the

Re: Log messages beginning # and git rebase -i

Duy Nguyen pclo...@gmail.com writes: On Wed, Jul 29, 2015 at 12:48 AM, Matthieu Moy matthieu@grenoble-inp.fr wrote: If the user wants whatever she types in the resulting commit literally, there is the --cleanup=choice option, no? $ GIT_EDITOR=touch git commit --cleanup=verbatim

Re: Log messages beginning # and git rebase -i

Eric Sunshine sunshine at sunshineco.com writes: the editing for the combined log message treats lines beginning with # as comments. This means that if you are not careful the commit message can get lost on rebasing. I suggest that git rebase should add an extra space at the start 'git rebase

Re: Log messages beginning # and git rebase -i

Ed Avis e...@waniasset.com writes: Eric Sunshine sunshine at sunshineco.com writes: the editing for the combined log message treats lines beginning with # as comments. This means that if you are not careful the commit message can get lost on rebasing. I suggest that git rebase should add an

Re: Log messages beginning # and git rebase -i

Matthieu Moy matthieu@grenoble-inp.fr writes: Ed Avis e...@waniasset.com writes: Eric Sunshine sunshine at sunshineco.com writes: the editing for the combined log message treats lines beginning with # as comments. This means that if you are not careful the commit message can get lost on

Re: Log messages beginning # and git rebase -i

Junio C Hamano gits...@pobox.com writes: Matthieu Moy matthieu@grenoble-inp.fr writes: Actually, is there any reason why we do not allow a simple escaping like \# this is a line starting with # \\ this is a line starting with \ # this is a comment What are we trying to achieve? What

Re: Log messages beginning # and git rebase -i

Matthieu Moy matthieu@grenoble-inp.fr writes: A simple escaping scheme like the above can solve both points: 1) If I want to talk about #include in my commit message, I can spell it \#include and Git would remove the \. The same way, if I want to tell my shell about a inside a

Log messages beginning # and git rebase -i

git commit will happily let you specify log messages beginning with #. But then on git rebase -i, when squashing some commits, the editing for the combined log message treats lines beginning with # as comments. This means that if you are not careful the commit message can get lost on rebasing. I

Re: Log messages beginning # and git rebase -i

On Mon, Jul 27, 2015 at 7:38 AM, Ed Avis e...@waniasset.com wrote: git commit will happily let you specify log messages beginning with #. But then on git rebase -i, when squashing some commits, the editing for the combined log message treats lines beginning with # as comments. This means that

Re: Log messages beginning # and git rebase -i

On Tue, Jul 28, 2015 at 6:25 AM, Eric Sunshine sunsh...@sunshineco.com wrote: On Mon, Jul 27, 2015 at 7:38 AM, Ed Avis e...@waniasset.com wrote: git commit will happily let you specify log messages beginning with #. But then on git rebase -i, when squashing some commits, the editing for the