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

diff --cc Documentation/git-rebase.txt
Simple merge

diff --cc builtin/rebase.c
index b62b450f8c865ed5b73bf33c149c7e612cb6e2c3,75c2ebd4c3596cd0885300ab54132d47f97cfa2a..c466923869d6fdd211347125986e26c82e1d0153
--- 1/builtin/rebase.c
--- 2/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 (gpg_sign) {
 -              free(options.gpg_sign_opt);
+       if (options.reapply_cherry_picks)
+               imply_merge(&options, "--reapply-cherry-picks");
+ 
 +      if (gpg_sign)
                options.gpg_sign_opt = xstrfmt("-S%s", gpg_sign);
 -      }
  
        if (exec.nr) {
                int i;

diff --cc sequencer.c
Simple merge

diff --cc sequencer.h
Simple merge