From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 22 Apr 2020 20:43:00 +0000 (-0700)
Subject: Merge branch 'jt/rebase-allow-duplicate'
X-Git-Tag: v2.27.0-rc0~103
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d6d561db1c0a14e8b89149694c0c662096c5fc9d;p=thirdparty%2Fgit.git

Merge branch 'jt/rebase-allow-duplicate'

Allow "git rebase" to reapply all local commits, even if the may be
already in the upstream, without checking first.

* jt/rebase-allow-duplicate:
  rebase --merge: optionally skip upstreamed commits
---

d6d561db1c0a14e8b89149694c0c662096c5fc9d
diff --cc builtin/rebase.c
index b62b450f8c,75c2ebd4c3..c466923869
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@@ -1829,8 -1829,13 +1833,11 @@@ int cmd_rebase(int argc, const char **a
  	if (options.empty != EMPTY_UNSPECIFIED)
  		imply_merge(&options, "--empty");
  
+ 	if (options.reapply_cherry_picks)
+ 		imply_merge(&options, "--reapply-cherry-picks");
+ 
 -	if (gpg_sign) {
 -		free(options.gpg_sign_opt);
 +	if (gpg_sign)
  		options.gpg_sign_opt = xstrfmt("-S%s", gpg_sign);
 -	}
  
  	if (exec.nr) {
  		int i;