Merge branch 'pw/rebase-keep-base-fixes'

"git rebase --keep-base" used to discard the commits that are
already cherry-picked to the upstream, even when "keep-base" meant
that the base, on top of which the history is being rebuilt, does
not yet include these cherry-picked commits.  The --keep-base
option now implies --reapply-cherry-picks and --no-fork-point
options.

* pw/rebase-keep-base-fixes:
  rebase --keep-base: imply --no-fork-point
  rebase --keep-base: imply --reapply-cherry-picks
  rebase: factor out branch_base calculation
  rebase: rename merge_base to branch_base
  rebase: store orig_head as a commit
  rebase: be stricter when reading state files containing oids
  t3416: set $EDITOR in subshell
  t3416: tighten two tests

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

diff --cc builtin/rebase.c
index 56e4214b44104a445f8b68d185c0aadd3442247d,ef520f66fb86d09fdae5a9e6f432726d8b537095..b9164a30bff5230e86ee6be48921c4c9f750ed7f
--- 1/builtin/rebase.c
--- 2/builtin/rebase.c
+++ b/builtin/rebase.c
@@@ -298,9 -297,8 +298,8 @@@ static int do_interactive_rebase(struc
                split_exec_commands(opts->cmd, &commands);
                ret = complete_action(the_repository, &replay, flags,
                        shortrevisions, opts->onto_name, opts->onto,
-                       &opts->orig_head, &commands, opts->autosquash,
-                       opts->update_refs,
-                       &todo_list);
+                       &opts->orig_head->object.oid, &commands,
 -                      opts->autosquash, &todo_list);
++                      opts->autosquash, opts->update_refs, &todo_list);
        }
  
        string_list_clear(&commands, 0);

diff --cc commit.c
Simple merge