git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: lists@haller-berlin.de (Stefan Haller)
To: git@vger.kernel.org
Subject: Limitiations of git rebase --preserve-merges --interactive
Date: Tue, 20 Sep 2016 10:46:02 +0200	[thread overview]
Message-ID: <1mtveu4.19lvgi1c0hmhaM%lists@haller-berlin.de> (raw)

The BUGS section of the git-rebase manpage says that editing or
rewording commits "should work fine", but attempts to reorder commits
usually don't do what you want.

I'd like to know more about what does or doesn't work. For example, will
squashing commits work? (I.e. using the "fixup" or "squash" commands in
the todo sheet.)

Will dropping commits work?

Does it make sense to insert "exec" commands, or will they run at
arbitrary times?


-- 
Stefan Haller
Berlin, Germany
http://www.haller-berlin.de/

             reply	other threads:[~2016-09-20  8:54 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-09-20  8:46 Stefan Haller [this message]
2016-09-22 19:33 ` Limitiations of git rebase --preserve-merges --interactive Anatoly Borodin
2016-09-22 19:48   ` Kevin Daudt
2016-09-22 20:54     ` Stefan Beller
2016-09-23 10:40       ` Stefan Haller
2016-09-23 21:13         ` Johannes Schindelin
2016-09-23 22:26           ` Stefan Beller
2016-09-22 21:04     ` Anatoly Borodin
2016-09-22 21:01 ` Anatoly Borodin
2016-09-22 21:08   ` Stefan Beller
2016-09-23 21:04     ` Johannes Schindelin
2016-09-23 10:40   ` Stefan Haller
2016-09-23 15:37     ` Junio C Hamano
2016-09-23 15:50       ` Stefan Haller
2016-09-23 19:24         ` Johannes Sixt

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=1mtveu4.19lvgi1c0hmhaM%lists@haller-berlin.de \
    --to=lists@haller-berlin.de \
    --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).