Re: [PATCH] Make git revert warn the user when reverting a merge commit.

From: Boyd Stephen Smith Jr. <bss@iguanasuicide.net>
Date: Dec 19, 2008, 05:54 UTC
Message-ID: <200812182354.16269.bss@iguanasuicide.net>
In-Reply-To: <76718490812181955u5f56180en47b3a8268c3538bb@mail.gmail.com>

On Thursday 2008 December 18 21:55:13 Jay Soffian wrote:

Show 11 quoted lines

> On Thu, Dec 18, 2008 at 10:29 PM, Boyd Stephen Smith Jr.
>
> <bss@iguanasuicide.net> wrote:
> > At least, it might make someone read the manpage again.  Still, I'm
> > unhappy with the message, but I didn't want to be too wordy.  A URL or
> > manpage reference would be nice, but I didn't know of a good guide that
> > explained the dangers of reverting a merge commit as well as Linus's
> > emails.
>
> Put his email in Documentation/howto/undoing-merge-commits.txt and
> reference that?

Okay, I've got a documentation patch brewing, but it's too late here to work on it more. I'll post it over the weekend.

In addition, I think a one-time-per-user warning would be nice, but I'm not sure the best way to implement that. My initial thoughts would be reading a boolean config option, if unset/true issuing the warning and then if unset set it to false. However, that seems a bit... unclean and I fear there might be a policy against writing ~/.gitconfig configuration options from a subcommand other than 'git config'. Any suggestions on the implementation?

-- 
Boyd Stephen Smith Jr.                     ,= ,-_-. =. 
bss@iguanasuicide.net                     ((_/)o o(\_))
ICQ: 514984 YM/AIM: DaTwinkDaddy           `-'(. .)`-' 
http://iguanasuicide.net/                      \_/