From: Paolo Bonzini <bonzini@gnu.org>
Date: Sun, 13 Sep 2009 22:15:01 GMT
Subject: Re: [PATCH 4/4] reset: add test cases for "--merge-dirty" option
Message-ID: <4AAD6EE5.20508@gnu.org>
In-Reply-To: <200909110705.35083.chriscool@tuxfamily.org>


> If they get merged, the option name '--merge-dirty" will probably be changed
> to something else like "--merge-safe" so I will have to change some patches
> anyway.

--merge-index or --merge-staged?

Also, it would be great if you would prepare tables like these for all 
cases of git-reset.

Paolo