X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=Documentation%2Fdiff-options.txt;h=7e27841a95b62cc9d7a5223f66ce248c5a1f15c3;hb=db757e8b8d5527c195c461a04ec35d141ddea48e;hp=c89d530d3d1d39dbed0a46b3fa3f6def92ed7def;hpb=48939c572c68b06c9b89834c73743fa89a718652;p=thirdparty%2Fgit.git

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index c89d530d3d..7e27841a95 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -34,7 +34,7 @@ endif::git-diff[]
 endif::git-format-patch[]
 
 ifdef::git-log[]
---diff-merges=(off|none|on|first-parent|1|separate|m|combined|c|dense-combined|cc)::
+--diff-merges=(off|none|on|first-parent|1|separate|m|combined|c|dense-combined|cc|remerge|r)::
 --no-diff-merges::
 	Specify diff format to be used for merge commits. Default is
 	{diff-merges-default} unless `--first-parent` is in use, in which case
@@ -64,6 +64,18 @@ ifdef::git-log[]
 	each of the parents. Separate log entry and diff is generated
 	for each parent.
 +
+--diff-merges=remerge:::
+--diff-merges=r:::
+--remerge-diff:::
+	With this option, two-parent merge commits are remerged to
+	create a temporary tree object -- potentially containing files
+	with conflict markers and such.  A diff is then shown between
+	that temporary tree and the actual merge commit.
++
+The output emitted when this option is used is subject to change, and
+so is its interaction with other options (unless explicitly
+documented).
++
 --diff-merges=combined:::
 --diff-merges=c:::
 -c:::