diff options
| author | Michael J Gruber <git@drmicha.warpmail.net> | 2010-03-15 11:54:45 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-15 15:20:03 -0700 |
| commit | 71928f7f11355a25873b9693e9009acad31f40ef (patch) | |
| tree | 3b1ef4c2987eba3c2df98aac3a3241746a6bef1a /Documentation/git-read-tree.txt | |
| parent | 8fcaca3ff29a193f50a44bb3d5734a503e0539a6 (diff) | |
| download | git-71928f7f11355a25873b9693e9009acad31f40ef.tar.gz | |
Documentation/git-read-tree: fix table layout
Asciidoc takes the first non-space character in the first line of the
paragraph as a reference point for preformatted layout, so adjust to
that to make the table align.
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-read-tree.txt')
| -rw-r--r-- | Documentation/git-read-tree.txt | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt index 567671c013..5aaf0d5fde 100644 --- a/Documentation/git-read-tree.txt +++ b/Documentation/git-read-tree.txt @@ -164,23 +164,23 @@ Here are the "carry forward" rules: I (index) H M Result ------------------------------------------------------- - 0 nothing nothing nothing (does not happen) - 1 nothing nothing exists use M - 2 nothing exists nothing remove path from index - 3 nothing exists exists, use M if "initial checkout" + 0 nothing nothing nothing (does not happen) + 1 nothing nothing exists use M + 2 nothing exists nothing remove path from index + 3 nothing exists exists, use M if "initial checkout" H == M keep index otherwise exists fail H != M clean I==H I==M ------------------ - 4 yes N/A N/A nothing nothing keep index - 5 no N/A N/A nothing nothing keep index + 4 yes N/A N/A nothing nothing keep index + 5 no N/A N/A nothing nothing keep index - 6 yes N/A yes nothing exists keep index - 7 no N/A yes nothing exists keep index - 8 yes N/A no nothing exists fail - 9 no N/A no nothing exists fail + 6 yes N/A yes nothing exists keep index + 7 no N/A yes nothing exists keep index + 8 yes N/A no nothing exists fail + 9 no N/A no nothing exists fail 10 yes yes N/A exists nothing remove path from index 11 no yes N/A exists nothing fail |