From: Johannes Sixt <j.sixt@viscovery.net>
To: Jay Soffian <jaysoffian@gmail.com>
Cc: git <git@vger.kernel.org>
Subject: Re: Amending a merge commit doesn't update the rerere cache
Date: Tue, 15 Jun 2010 08:23:55 +0200 [thread overview]
Message-ID: <4C171C7B.3060904@viscovery.net> (raw)
In-Reply-To: <AANLkTik50ayTQUnft4oD0Paqf-AuFWxGNdx_zZlHKFPg@mail.gmail.com>
Am 6/15/2010 1:04, schrieb Jay Soffian:
> Subject says it all, but I'll elaborate.
>
> During the course of testing a merge, I'll sometimes realize there was
> a mistake and I'll amend the merge commit. Sadly this doesn't update
> the rerere cache.
There is
git rerere forget that/conflicted/file
It definitely works as long as the conflict is still recorded in the
index; I'm not sure if it works after you have staged the updated resolution.
-- Hannes
next prev parent reply other threads:[~2010-06-15 6:24 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-14 23:04 Amending a merge commit doesn't update the rerere cache Jay Soffian
2010-06-15 6:21 ` [PATCH] rerere.txt: Document forget subcommand Michael J Gruber
2010-06-15 16:37 ` Junio C Hamano
2010-06-15 16:45 ` Jay Soffian
2010-06-16 7:42 ` Michael J Gruber
2010-06-16 17:33 ` Junio C Hamano
2010-07-05 13:15 ` [PATCHv2] " Michael J Gruber
2010-06-15 6:23 ` Johannes Sixt [this message]
2010-06-15 13:08 ` Amending a merge commit doesn't update the rerere cache Jay Soffian
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4C171C7B.3060904@viscovery.net \
--to=j.sixt@viscovery.net \
--cc=git@vger.kernel.org \
--cc=jaysoffian@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).