[PATCH] Documentation/diff-options.txt: unify options

From: <hidden>
Date: 2016-06-15 22:45:50
Subsystem: the rest · Maintainer: Linus Torvalds

Signed-off-by: jidanni <redacted>

diff --git a/diff-options.txt b/diff-options.txt
index 5721548..b05503a 100644
--- a/diff-options.txt
+++ b/diff-options.txt

@@ -21,0 +22 @@ ifndef::git-format-patch[]
+-u::

@@ -26,3 +26,0 @@ endif::git-format-patch[]
--u::
-	Synonym for "-p".
-

@@ -30,2 +27,0 @@ endif::git-format-patch[]
-	Shorthand for "--unified=<n>".
-

@@ -189,0 +186 @@ endif::git-format-patch[]
+-a::

@@ -193,3 +189,0 @@ endif::git-format-patch[]
--a::
-	Shorthand for "--text".
-

@@ -198,0 +193 @@ endif::git-format-patch[]
+-b::

@@ -204,3 +199 @@ endif::git-format-patch[]
--b::
-	Shorthand for "--ignore-space-change".
-
+-w::

@@ -212,3 +204,0 @@ endif::git-format-patch[]
--w::
-	Shorthand for "--ignore-all-space".
-

-- 
1.5.6.5