mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

user-manual: rewrap, fix heading levels

Browse Source 
Fix some heading levels that prevented compile; rewrap some stuff.

Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
This commit is contained in:
J. Bruce Fields
2007-01-14 22:43:47 -05:00
parent 67583917e9
commit 2f99710cfe
1 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
Documentation/user-manual.txt
View File

@ -770,7 +770,7 @@ Examples
-------- --------
Check whether two branches point at the same history Check whether two branches point at the same history
---------------------------------------------------- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Suppose you want to check whether two branches point at the same point Suppose you want to check whether two branches point at the same point
in history. in history.
@ -802,7 +802,7 @@ $ git log origin...master
will return no commits when the two branches are equal. will return no commits when the two branches are equal.
Check which tagged version a given fix was first included in Check which tagged version a given fix was first included in
------------------------------------------------------------ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Suppose you know that the commit e05db0fd fixed a certain problem. Suppose you know that the commit e05db0fd fixed a certain problem.
You'd like to find the earliest tagged release that contains that You'd like to find the earliest tagged release that contains that
@ -1723,14 +1723,15 @@ Notes and todo list for this manual
This is a work in progress. This is a work in progress.
The basic requirements: The basic requirements:
- It must be readable in order, from beginning to end, by someone - It must be readable in order, from beginning to end, by
intelligent with a basic grasp of the unix commandline, but someone intelligent with a basic grasp of the unix
without any special knowledge of git. If necessary, any other commandline, but without any special knowledge of git. If
prerequisites should be specifically mentioned as they arise. necessary, any other prerequisites should be specifically
- Whenever possible, section headings should clearly describe the mentioned as they arise.
task they explain how to do, in language that requires no more - Whenever possible, section headings should clearly describe
knowledge than necessary: for example, "importing patches into a the task they explain how to do, in language that requires
project" rather than "the git-am command" no more knowledge than necessary: for example, "importing
patches into a project" rather than "the git-am command"
Think about how to create a clear chapter dependency graph that will Think about how to create a clear chapter dependency graph that will
allow people to get to important topics without necessarily reading allow people to get to important topics without necessarily reading
@ -1748,20 +1749,25 @@ Scan email archives for other stuff left out
Scan man pages to see if any assume more background than this manual Scan man pages to see if any assume more background than this manual
provides. provides.
Simplify beginning by suggesting disconnected head instead of temporary Simplify beginning by suggesting disconnected head instead of
branch creation. temporary branch creation.
Explain how to refer to file stages in the "how to resolve a merge" Explain how to refer to file stages in the "how to resolve a merge"
section: diff -1, -2, -3, --ours, --theirs :1:/path notation. The section: diff -1, -2, -3, --ours, --theirs :1:/path notation. The
"git ls-files --unmerged --stage" thing is sorta useful too, actually. And "git ls-files --unmerged --stage" thing is sorta useful too,
note gitk --merge. Also what's easiest way to see common merge base? actually. And note gitk --merge. Also what's easiest way to see
common merge base? Note also text where I claim rebase and am
conflicts are resolved like merges isn't generally true, at least by
default--fix.
Add more good examples. Entire sections of just cookbook examples might Add more good examples. Entire sections of just cookbook examples
be a good idea; maybe make an "advanced examples" section a standard might be a good idea; maybe make an "advanced examples" section a
end-of-chapter section? standard end-of-chapter section?
Include cross-references to the glossary, where appropriate. Include cross-references to the glossary, where appropriate.
Add quickstart as first chapter.
To document: To document:
reflogs, git reflog expire reflogs, git reflog expire
shallow clones?? See draft 1.5.0 release notes for some documentation. shallow clones?? See draft 1.5.0 release notes for some documentation.