diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-10-18 07:19:11 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-10-18 07:19:11 +0200 |
| commit | e1a05be9d0c790a929ae39839ec0b2a742856e02 (patch) | |
| tree | 1d779b254a213da73690a323d8127d4dc3edbde5 | |
| parent | Merge branch 'hn/typofix' into maint (diff) | |
| parent | doc: put literal block delimiter around table (diff) | |
| download | git-e1a05be9d0c790a929ae39839ec0b2a742856e02.tar.xz git-e1a05be9d0c790a929ae39839ec0b2a742856e02.zip | |
Merge branch 'jk/doc-read-tree-table-asciidoctor-fix' into maint
A docfix.
* jk/doc-read-tree-table-asciidoctor-fix:
doc: put literal block delimiter around table
| -rw-r--r-- | Documentation/git-read-tree.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt index 02576d8c0a..72bd809fb8 100644 --- a/Documentation/git-read-tree.txt +++ b/Documentation/git-read-tree.txt @@ -179,6 +179,7 @@ Here are the "carry forward" rules, where "I" denotes the index, "clean" means that index and work tree coincide, and "exists"/"nothing" refer to the presence of a path in the specified commit: +.... I H M Result ------------------------------------------------------- 0 nothing nothing nothing (does not happen) @@ -217,6 +218,7 @@ refer to the presence of a path in the specified commit: 19 no no yes exists exists keep index 20 yes yes no exists exists use M 21 no yes no exists exists fail +.... In all "keep index" cases, the index entry stays as in the original index file. If the entry is not up to date, |