From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 24 Feb 2017 18:48:07 +0000 (-0800)
Subject: Merge branch 'bc/blame-doc-fix'
X-Git-Tag: v2.12.0~6
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/af4027f2decece569e7a565e592ca69677c27996?ds=inline;hp=-c

Merge branch 'bc/blame-doc-fix'

Doc update.

* bc/blame-doc-fix:
Documentation: use brackets for optional arguments
---

af4027f2decece569e7a565e592ca69677c27996
diff --combined Documentation/blame-options.txt
index 2669b87c9d,c233a72f79..dc41957afa
--- a/Documentation/blame-options.txt
+++ b/Documentation/blame-options.txt
@@@ -28,13 -28,12 +28,13 @@@ include::line-range-format.txt[
  -S <revs-file>::
  	Use revisions from revs-file instead of calling linkgit:git-rev-list[1].
  
 ---reverse::
 +--reverse <rev>..<rev>::
  	Walk history forward instead of backward. Instead of showing
  	the revision in which a line appeared, this shows the last
  	revision in which a line has existed. This requires a range of
  	revision like START..END where the path to blame exists in
 -	START.
 +	START.  `git blame --reverse START` is taken as `git blame
 +	--reverse START..HEAD` for convenience.
  
  -p::
  --porcelain::
@@@ -77,7 -76,7 +77,7 @@@
  	terminal. Can't use `--progress` together with `--porcelain`
  	or `--incremental`.
  
- -M|<num>|::
+ -M[<num>]::
  	Detect moved or copied lines within a file. When a commit
  	moves or copies a block of lines (e.g. the original file
  	has A and then B, and the commit changes it to B and then
@@@ -93,7 -92,7 +93,7 @@@ alphanumeric characters that Git must d
  within a file for it to associate those lines with the parent
  commit. The default value is 20.
  
- -C|<num>|::
+ -C[<num>]::
  	In addition to `-M`, detect lines moved or copied from other
  	files that were modified in the same commit.  This is
  	useful when you reorganize your program and move code