Commits

Junio C Hamano  committed 80a3f53 Merge

Merge branch 'maint-1.7.8' into maint

By Thomas Rast
* maint-1.7.8:
Document the --histogram diff option

  • Participants
  • Parent commits 69f4e08, e521850

Comments (0)

Files changed (1)

File Documentation/diff-options.txt

 --patience::
 	Generate a diff using the "patience diff" algorithm.
 
+--histogram::
+	Generate a diff using the "histogram diff" algorithm.
+
 --stat[=<width>[,<name-width>[,<count>]]]::
 	Generate a diffstat.  You can override the default
 	output width for 80-column terminal by `--stat=<width>`.