From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 16 Apr 2019 10:28:07 +0000 (+0900)
Subject: Merge branch 'pw/rerere-autoupdate'
X-Git-Tag: v2.22.0-rc0~109
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/fffbf7c6ba3a3653b92329f879d238e6fea4dfce?ds=inline;hp=-c

Merge branch 'pw/rerere-autoupdate'

Doc updates.

* pw/rerere-autoupdate:
merge: tweak --rerere-autoupdate documentation
am/cherry-pick/rebase/revert: document --rerere-autoupdate
---

fffbf7c6ba3a3653b92329f879d238e6fea4dfce
diff --combined Documentation/git-rebase.txt
index 44e00329e1,ed62b0c2de..f5e6ae3907
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@@ -300,6 -300,11 +300,11 @@@ See also INCOMPATIBLE OPTIONS below
  +
  See also INCOMPATIBLE OPTIONS below.
  
+ --rerere-autoupdate::
+ --no-rerere-autoupdate::
+ 	Allow the rerere mechanism to update the index with the
+ 	result of auto-conflict resolution if possible.
+ 
  -S[<keyid>]::
  --gpg-sign[=<keyid>]::
  	GPG-sign commits. The `keyid` argument is optional and
@@@ -415,9 -420,9 +420,9 @@@ i.e. commits that would be excluded by 
  the `rebase-cousins` mode is turned on, such commits are instead rebased
  onto `<upstream>` (or `<onto>`, if specified).
  +
 -The `--rebase-merges` mode is similar in spirit to `--preserve-merges`, but
 -in contrast to that option works well in interactive rebases: commits can be
 -reordered, inserted and dropped at will.
 +The `--rebase-merges` mode is similar in spirit to the deprecated
 +`--preserve-merges`, but in contrast to that option works well in interactive
 +rebases: commits can be reordered, inserted and dropped at will.
  +
  It is currently only possible to recreate the merge commits using the
  `recursive` merge strategy; Different merge strategies can be used only via
@@@ -427,10 -432,9 +432,10 @@@ See also REBASING MERGES and INCOMPATIB
  
  -p::
  --preserve-merges::
 -	Recreate merge commits instead of flattening the history by replaying
 -	commits a merge commit introduces. Merge conflict resolutions or manual
 -	amendments to merge commits are not preserved.
 +	[DEPRECATED: use `--rebase-merges` instead] Recreate merge commits
 +	instead of flattening the history by replaying commits a merge commit
 +	introduces. Merge conflict resolutions or manual amendments to merge
 +	commits are not preserved.
  +
  This uses the `--interactive` machinery internally, but combining it
  with the `--interactive` option explicitly is generally not a good
@@@ -1021,11 -1025,11 +1026,11 @@@ merge cmak
  
  BUGS
  ----
 -The todo list presented by `--preserve-merges --interactive` does not
 -represent the topology of the revision graph.  Editing commits and
 -rewording their commit messages should work fine, but attempts to
 -reorder commits tend to produce counterintuitive results. Use
 -`--rebase-merges` in such scenarios instead.
 +The todo list presented by the deprecated `--preserve-merges --interactive`
 +does not represent the topology of the revision graph (use `--rebase-merges`
 +instead).  Editing commits and rewording their commit messages should work
 +fine, but attempts to reorder commits tend to produce counterintuitive results.
 +Use `--rebase-merges` in such scenarios instead.
  
  For example, an attempt to rearrange
  ------------