aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@citi.umich.edu>2007-01-08 21:59:42 -0500
committerJ. Bruce Fields <bfields@citi.umich.edu>2007-01-08 21:59:42 -0500
commite9c0390a9251714f4f4b54b4e3dddb2e65d18fa8 (patch)
tree1dd82eba34a2242c0adb0028d9f089fc0eeee1bb
parent4c63ff452ff04cd13819bf05f30e0df55b50510f (diff)
downloadgit-e9c0390a9251714f4f4b54b4e3dddb2e65d18fa8.tar.gz
git-e9c0390a9251714f4f4b54b4e3dddb2e65d18fa8.tar.xz
Documentation: more user-manual todo's
Add some more todo's for the user manual. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
-rw-r--r--Documentation/user-manual.txt17
1 files changed, 16 insertions, 1 deletions
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index b699c9b4e..a2fd5d275 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -1632,7 +1632,22 @@ Can also simplify beginning by suggesting disconnected head instead
of temporary branch creation.
Explain how to refer to file stages in the "how to resolve a merge"
-section: diff -1, -2, -3, --ours, --theirs :1:/path notation.
+section: diff -1, -2, -3, --ours, --theirs :1:/path notation. The
+"git ls-files --unmerged --stage" thing is sorta useful too, actually. And
+note gitk --merge. Also what's easiest way to see common merge base?
+
+Add more good examples. Entire sections of just cookbook examples might be a
+good idea; maybe make an "advanced examples" section a standard end-of-chapter
+section?
Include cross-references to the glossary, where appropriate.
+Update for detached-head.
+
+Update for git-remote. Even if the command isn't there yet, I think we should
+probably just document the repository configuration necessary to set it up, as
+the default way to keep a repository up-to-date.
+
+To document:
+ reflogs, git reflog expire
+ shallow clones?? See draft 1.5.0 release notes for some documentation.