git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: skillzero@gmail.com
To: Git Mailing List <git@vger.kernel.org>
Subject: git rebase --continue automatic --skip?
Date: Fri, 8 Apr 2011 13:30:01 -0700	[thread overview]
Message-ID: <BANLkTi=Vc6kB5fvZrqMwDD+yHFb5qENQ8g@mail.gmail.com> (raw)

Is there a way to make git rebase --continue automatically do a --skip
if a conflict resolution ends up not needing the patch? Normally, git
rebase will just silently skip a patch if it's not needed, but if a
patch results in a conflict and I use git mergetool and end up
deleting all the changes, git rebase --continue stops and makes me
explicitly use --skip.

It's a not a big deal, but it happens a lot to me because I do work on
a branch that really should have gone on master, but I don't want to
disrupt my branch work (i.e. I'm lazy) so I do it directly on the
branch then later clean up those commits by isolating the parts that
are truly part of the topic vs parts that are unrelated. So I hit a
conflict, but want to take the version from master (so the commit
disappears from the branch).

             reply	other threads:[~2011-04-08 20:30 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-04-08 20:30 skillzero [this message]
2011-04-09  0:03 ` git rebase --continue automatic --skip? Jeff King
2011-04-09 13:03   ` Peter Baumann
2011-04-10  1:33     ` Junio C Hamano
2011-04-11  6:10     ` Peter Baumann
2011-04-10  1:24   ` Junio C Hamano
2011-04-13 19:02     ` Joshua Juran

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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='BANLkTi=Vc6kB5fvZrqMwDD+yHFb5qENQ8g@mail.gmail.com' \
    --to=skillzero@gmail.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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).