From: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Eric Wong <e@80x24.org>,
Johannes Schindelin <johannes.schindelin@gmx.de>,
Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 0/1] git svn: use rebase --rebase-merges instead of preserve-merges
Date: Fri, 22 Nov 2019 22:59:28 +0000 [thread overview]
Message-ID: <pull.295.git.1574463569.gitgitgadget@gmail.com> (raw)
By now, git rebase -r is on par with git rebase -p (or better), at least as
far as git svn's usage is concerned. So let's use the former instead of the
(deprecated) latter option.
Johannes Schindelin (1):
git svn: stop using `rebase --preserve-merges`
Documentation/git-svn.txt | 3 ++-
git-svn.perl | 9 +++++----
2 files changed, 7 insertions(+), 5 deletions(-)
base-commit: d9f6f3b6195a0ca35642561e530798ad1469bd41
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-295%2Fdscho%2Fuse-rebase-r-in-git-svn-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-295/dscho/use-rebase-r-in-git-svn-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/295
--
gitgitgadget
next reply other threads:[~2019-11-22 22:59 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-22 22:59 Johannes Schindelin via GitGitGadget [this message]
2019-11-22 22:59 ` [PATCH 1/1] git svn: stop using `rebase --preserve-merges` Johannes Schindelin via GitGitGadget
2019-11-23 0:08 ` Eric Wong
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=pull.295.git.1574463569.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=e@80x24.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
/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).