All of lore.kernel.org
 help / color / mirror / Atom feed
From: Phil Hord <hordp@cisco.com>
To: "git@vger.kernel.org" <git@vger.kernel.org>
Subject: rerere.autoupdate that wouldn't
Date: Fri, 09 Mar 2012 17:34:40 -0500	[thread overview]
Message-ID: <4F5A8580.1010807@cisco.com> (raw)

So now I have rerere.autoupdate=true (living on the edge!), and today I
rebased a branch and git did a new thing: it added the automerged file
to the index like I expected. 

Then git did an unexpected thing.  It told me the merge had failed and
it asked me to clean it up.  There were no other conflicts; just this
one conflict that was already automerged and added to my index.

All I had to do was 'git rebase --continue' and off it went.

But I was hoping for more.  I was hoping that rebase would continue on
its own and quit bothering me with these triflings. 

Is this what is supposed to happen?  Should I look into adding
'rerere.autoContinue=true'?

Maybe instead, the sane thing would be to add 'rerere.autoTest=make
test'.  Then if rerere is so worried about messing up my rebase, he can
take a moment to do a build test to comfort his conscience.

Phil

             reply	other threads:[~2012-03-09 22:34 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-03-09 22:34 Phil Hord [this message]
2012-03-09 22:46 ` rerere.autoupdate that wouldn't Junio C Hamano
2012-03-09 22:51   ` Phil Hord

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=4F5A8580.1010807@cisco.com \
    --to=hordp@cisco.com \
    --cc=git@vger.kernel.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.