diff options
author | Jonas Fonseca <fonseca@diku.dk> | 2005-10-03 19:16:30 +0200 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2005-10-03 13:23:47 -0700 |
commit | df8baa42fe4eeb5a021ac262caf601f44d2a5746 (patch) | |
tree | a2e2c531e7e2718451f8357902ba3bdcc6571804 /Documentation/git-read-tree.txt | |
parent | 5a82b4fb3e547c4aa14cd417790b3f925713a422 (diff) | |
download | git-df8baa42fe4eeb5a021ac262caf601f44d2a5746.tar.gz |
[PATCH] Random documentation fixes
The fixes focuses on improving the HTML output. Most noteworthy:
- Fix the Makefile to also make various *.html files depend on
included files.
- Consistently use 'NOTE: ...' instead of '[ ... ]' for additional
info.
- Fix ending '::' for description lists in OPTION section etc.
- Fix paragraphs in description lists ending up as preformated text.
- Always use listingblocks (preformatted text wrapped in lines with -----)
for examples that span empty lines, so they are put in only one HTML
block.
- Use '1.' instead of '(1)' for numbered lists.
- Fix linking to other GIT docs.
- git-rev-list.txt: put option descriptions in an OPTION section.
Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-read-tree.txt')
-rw-r--r-- | Documentation/git-read-tree.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt index 0639bd04b2..5653baccaf 100644 --- a/Documentation/git-read-tree.txt +++ b/Documentation/git-read-tree.txt @@ -84,10 +84,10 @@ fast forward situation). When two trees are specified, the user is telling git-read-tree the following: - (1) The current index and work tree is derived from $H, but + 1. The current index and work tree is derived from $H, but the user may have local changes in them since $H; - (2) The user wants to fast-forward to $M. + 2. The user wants to fast-forward to $M. In this case, the "git-read-tree -m $H $M" command makes sure that no local change is lost as the result of this "merge". |