Re: [PATCH] add "-f" option to git-commit-script to force commit withoutchanges

Hi, On Thu, 28 Jul 2005, Junio C Hamano wrote: > While I agree there should be a graceful way to go back to the > original head from a failed merge situation, I do not think > "committing the current HEAD" is the right model for the end > user to think about it. > > Wouldn't using "checkout -f" t

Re: [PATCH] add "-f" option to git-commit-script to force commit withoutchanges

While I agree there should be a graceful way to go back to the original head from a failed merge situation, I do not think "committing the current HEAD" is the right model for the end user to think about it. Wouldn't using "checkout -f" to revert to the version you would want to go back work as ex

[PATCH] add "-f" option to git-commit-script to force commit withoutchanges

Sometimes a failed automatic merge means that we do not want those changes. In this case, it is desirable to commit the current HEAD (as if actually something was merged). Signed-off-by: Johannes Schindelin <[EMAIL PROTECTED]> --- git-commit-script |8 ++-- 1 files changed, 6 insertion