summaryrefslogtreecommitdiff
path: root/Documentation/diff-options.txt
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <Johannes.Schindelin@gmx.de>2009-01-01 17:39:17 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-01-07 13:37:07 -0800
commit34292bddb861f3cb52a524fdce67234430a744fe (patch)
tree9a74c749c894ff44233e024ba16e24c5c18ca9cc /Documentation/diff-options.txt
parentImplement the patience diff algorithm (diff)
downloadtgif-34292bddb861f3cb52a524fdce67234430a744fe.tar.xz
Introduce the diff option '--patience'
This commit teaches Git to produce diff output using the patience diff algorithm with the diff option '--patience'. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/diff-options.txt')
-rw-r--r--Documentation/diff-options.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index c62b45cdba..808bf87277 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -40,6 +40,9 @@ endif::git-format-patch[]
--patch-with-raw::
Synonym for "-p --raw".
+--patience:
+ Generate a diff using the "patience diff" algorithm.
+
--stat[=width[,name-width]]::
Generate a diffstat. You can override the default
output width for 80-column terminal by "--stat=width".