Merge branch 'ra/rebase-i-more-options'

"git rebase -i" learned a few options that are known by "git
rebase" proper.

* ra/rebase-i-more-options:
  rebase -i: finishing touches to --reset-author-date
  rebase: add --reset-author-date
  rebase -i: support --ignore-date
  sequencer: rename amend_author to author_to_rename
  rebase -i: support --committer-date-is-author-date
  sequencer: allow callers of read_author_script() to ignore fields
  rebase -i: add --ignore-whitespace flag

diff --cc Documentation/git-rebase.txt
index 0c4f038dd6077fb47436e82c2ce80b78fa6b9304,03809da835e49a82bac62edfda923fe918f119ce..1d0e2d27cc3855a260cfe4067ce3cf4a3cf94e00
--- 1/Documentation/git-rebase.txt
--- 2/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@@ -387,14 -369,18 +387,22 @@@ ends up being empty, the <upstream> wil
  +
  If either <upstream> or --root is given on the command line, then the
  default is `--no-fork-point`, otherwise the default is `--fork-point`.
 ++
 +If your branch was based on <upstream> but <upstream> was rewound and
 +your branch contains commits which were dropped, this option can be used
 +with `--keep-base` in order to drop those commits from your branch.
  
  --ignore-whitespace::
+       Behaves differently depending on which backend is selected.
+ +
+ 'am' backend: When applying a patch, ignore changes in whitespace in
+ context lines if necessary.
+ +
+ 'interactive' backend: Treat lines with only whitespace changes as
+ unchanged for the sake of a three-way merge.
+ 
  --whitespace=<option>::
-       These flag are passed to the 'git apply' program
+       This flag is passed to the 'git apply' program
        (see linkgit:git-apply[1]) that applies the patch.
  +
  See also INCOMPATIBLE OPTIONS below.
@@@ -565,8 -555,11 +577,11 @@@ In addition, the following pairs of opt
   * --preserve-merges and --interactive
   * --preserve-merges and --signoff
   * --preserve-merges and --rebase-merges
 - * --rebase-merges and --strategy
 - * --rebase-merges and --strategy-option
+  * --preserve-merges and --ignore-whitespace
+  * --preserve-merges and --committer-date-is-author-date
+  * --preserve-merges and --ignore-date
 + * --keep-base and --onto
 + * --keep-base and --root
  
  BEHAVIORAL DIFFERENCES
  -----------------------

diff --cc builtin/rebase.c
index e755087b0f1ebe11472ab4e4ef7165a4714e4e2f,0ddab0bcd27936e97e977520c6c72dfbf4909c4a..a11e15b86f932a00ab9ca00c0bd6c0faf3ed53c9
--- 1/builtin/rebase.c
--- 2/builtin/rebase.c
+++ b/builtin/rebase.c
@@@ -509,9 -521,11 +522,11 @@@ int cmd_rebase__interactive(int argc, c
        if (argc == 1)
                usage_with_options(builtin_rebase_interactive_usage, options);
  
 -      argc = parse_options(argc, argv, NULL, options,
 +      argc = parse_options(argc, argv, prefix, options,
                        builtin_rebase_interactive_usage, PARSE_OPT_KEEP_ARGV0);
  
+       opts.strategy_opts = xstrdup_or_null(opts.strategy_opts);
+ 
        if (!is_null_oid(&squash_onto))
                opts.squash_onto = &squash_onto;
  

diff --cc sequencer.c
Simple merge

diff --cc sequencer.h
Simple merge

diff --cc t/t3422-rebase-incompatible-options.sh
Simple merge