git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Dakota Hawkins <dakota@dakotahawkins.com>
To: git <git@vger.kernel.org>
Subject: [RFC] Add config option corresponding to --rebase-merges
Date: Fri, 23 Aug 2019 13:19:45 -0400	[thread overview]
Message-ID: <CAHnyXxScGO6Eex_AEbgH=YFQ2yzY1hnXavyNMkiXbrccVUA=Ug@mail.gmail.com> (raw)

I'd like to work on a patch to add config options that correspond to
rebase's --rebase-merges flag.

In my workflow, while it's uncommon to encounter merge commits during
a rebase operation, when they are encountered I pretty much always
want this behavior. Since it's rare, I pretty much always forget to
ask for it, with interesting and confusing consequences.

If nobody has any opposition to the concept, the following are the
specific options and values that I think makes sense and covers the
existing functionality.

# New rebase.merges config that takes effect if set to true or cousins
+ rebase.merges=
+   true
+   cousins

# New cousins value for pull.rebase
pull.rebase=
+   cousins

# New pull.rebaseMerges config that takes effect if set to true or
# cousins. Intended to allow pull.rebase to be set to interactive.
+ pull.rebaseMerges=
+   true
+   cousins

# Corresponding additions for branch.<name> config
branch.<name>.rebase=
+   cousins
branch.<name>.rebaseMerges=
+   true
+   cousins

I'd like to get feedback on the idea and specific options proposed,
if only to avoid having to tweak them once they've been added.

Thanks,

Dakota Hawkins

             reply	other threads:[~2019-08-23 17:19 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-23 17:19 Dakota Hawkins [this message]
2019-08-24 21:59 ` [RFC] Add config option corresponding to --rebase-merges Dakota Hawkins
2019-08-26 14:19 ` Johannes Schindelin
2019-08-26 14:50   ` Dakota Hawkins

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='CAHnyXxScGO6Eex_AEbgH=YFQ2yzY1hnXavyNMkiXbrccVUA=Ug@mail.gmail.com' \
    --to=dakota@dakotahawkins.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).