diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-11-06 04:11:27 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-06 04:11:27 (GMT) |
| commit | 662ac3b3a8a16fd749b598c85c4d8bfea5bb208e (patch) | |
| tree | df06d7c450c987d4f94c8e5b9ae1ccf109ef077d | |
| parent | 2502f018f4cc514b75bdd50c20695d8a35e1d0b5 (diff) | |
| parent | bab76141da04ab094ece449e2127ef43a8fa60c8 (diff) | |
| download | git-662ac3b3a8a16fd749b598c85c4d8bfea5bb208e.zip git-662ac3b3a8a16fd749b598c85c4d8bfea5bb208e.tar.gz git-662ac3b3a8a16fd749b598c85c4d8bfea5bb208e.tar.bz2 | |
Merge branch 'cn/diff-indent-no-longer-is-experimental'
Doc update.
* cn/diff-indent-no-longer-is-experimental:
diff: --indent-heuristic is no longer experimental
| -rw-r--r-- | Documentation/diff-heuristic-options.txt | 5 | ||||
| -rw-r--r-- | Documentation/diff-options.txt | 7 | ||||
| -rw-r--r-- | Documentation/git-annotate.txt | 1 | ||||
| -rw-r--r-- | Documentation/git-blame.txt | 2 |
4 files changed, 6 insertions, 9 deletions
diff --git a/Documentation/diff-heuristic-options.txt b/Documentation/diff-heuristic-options.txt deleted file mode 100644 index d4f3d95..0000000 --- a/Documentation/diff-heuristic-options.txt +++ /dev/null @@ -1,5 +0,0 @@ ---indent-heuristic:: ---no-indent-heuristic:: - These are to help debugging and tuning experimental heuristics - (which are off by default) that shift diff hunk boundaries to - make patches easier to read. diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index a88c767..dd0dba5 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -63,7 +63,12 @@ ifndef::git-format-patch[] Synonym for `-p --raw`. endif::git-format-patch[] -include::diff-heuristic-options.txt[] +--indent-heuristic:: + Enable the heuristic that shift diff hunk boundaries to make patches + easier to read. This is the default. + +--no-indent-heuristic:: + Disable the indent heuristic. --minimal:: Spend extra time to make sure the smallest possible diff --git a/Documentation/git-annotate.txt b/Documentation/git-annotate.txt index 94be4b8..05fd482 100644 --- a/Documentation/git-annotate.txt +++ b/Documentation/git-annotate.txt @@ -23,7 +23,6 @@ familiar command name for people coming from other SCM systems. OPTIONS ------- include::blame-options.txt[] -include::diff-heuristic-options.txt[] SEE ALSO -------- diff --git a/Documentation/git-blame.txt b/Documentation/git-blame.txt index fdc3aea..16323eb 100644 --- a/Documentation/git-blame.txt +++ b/Documentation/git-blame.txt @@ -89,8 +89,6 @@ include::blame-options.txt[] abbreviated object name, use <n>+1 digits. Note that 1 column is used for a caret to mark the boundary commit. -include::diff-heuristic-options.txt[] - THE PORCELAIN FORMAT -------------------- |