git svn: use rebase --rebase-merges instead of preserve-merges
#295
Conversation
dscho
force-pushed
the
use-rebase-r-in-git-svn
branch
from
dbaba96 to
ed33105
Compare
dscho
added
the
needs-work
We deprecated `--preserve-merges` in favor of `--rebase-merges`; Let's reflect that in `git svn`. Note: Even when the user asks for `--preserve-merges`, we now silently pass `--rebase-merges` to `git rebase` instead. Technically, this is a change of behavior. But practically, `git svn` only ever asks for a non-interactive rebase, and `--preserve-merges` and `--rebase-merges` are on par with regard to that. Signed-off-by: Johannes Schindelin <[email protected]>
dscho
force-pushed
the
use-rebase-r-in-git-svn
branch
from
ed33105 to
c123d93
Compare
dscho
removed
the
needs-work
|
/submit |
|
Submitted as [email protected] |
![gitgitgadget[bot]](https://avatars.githubusercontent.com/in/12836?s=60&v=4){kind=small}
| @@ -677,7 +677,8 @@ config key: svn.authorsProg | |||
| -s<strategy>:: | |||
There was a problem hiding this comment.
On the Git mailing list, Eric Wong wrote (reply to this):
Johannes Schindelin via GitGitGadget <[email protected]> wrote:
> From: Johannes Schindelin <[email protected]>
>
> We deprecated `--preserve-merges` in favor of `--rebase-merges`; Let's
> reflect that in `git svn`.
>
> Note: Even when the user asks for `--preserve-merges`, we now silently
> pass `--rebase-merges` to `git rebase` instead. Technically, this is a
> change of behavior. But practically, `git svn` only ever asks for a
> non-interactive rebase, and `--preserve-merges` and `--rebase-merges`
> are on par with regard to that.
I've never used --preserve-merges or --rebase-merges even with
standalone git; but this seems fine as there's no actual
behavior change...
> Signed-off-by: Johannes Schindelin <[email protected]>
Acked-by: Eric Wong <[email protected]>
Thanks.
|
This patch series was integrated into pu via git@98e07a8. |
|
This branch is now known as |
|
This patch series was integrated into pu via git@1e818d0. |
|
This patch series was integrated into pu via git@40ebfc8. |
|
This patch series was integrated into next via git@9585fe3. |
|
This patch series was integrated into pu via git@1e2f449. |
|
This patch series was integrated into pu via git@eb14345. |
|
This patch series was integrated into pu via git@4c395fd. |
|
This patch series was integrated into pu via git@75bd003. |
|
This patch series was integrated into next via git@75bd003. |
|
This patch series was integrated into master via git@75bd003. |
|
Closed via 75bd003. |
By now,
git rebase -ris on par withgit rebase -p(or better), at least as far asgit svn's usage is concerned. So let's use the former instead of the (deprecated) latter option.Cc: Eric Wong [email protected]