summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-archive.txt2
-rw-r--r--Documentation/git-cherry.txt3
-rw-r--r--Documentation/git-clone.txt2
-rw-r--r--Documentation/git-prune.txt2
-rw-r--r--Documentation/tutorial.txt4
-rw-r--r--Documentation/user-manual.txt17
6 files changed, 19 insertions, 11 deletions
diff --git a/Documentation/git-archive.txt b/Documentation/git-archive.txt
index 721e0351c3..4da07c1580 100644
--- a/Documentation/git-archive.txt
+++ b/Documentation/git-archive.txt
@@ -3,7 +3,7 @@ git-archive(1)
NAME
----
-git-archive - Creates an archive of files from a named tree
+git-archive - Create an archive of files from a named tree
SYNOPSIS
diff --git a/Documentation/git-cherry.txt b/Documentation/git-cherry.txt
index 27b67b81a5..8c7d9670d3 100644
--- a/Documentation/git-cherry.txt
+++ b/Documentation/git-cherry.txt
@@ -53,6 +53,9 @@ OPTIONS
<head>::
Working branch; defaults to HEAD.
+<limit>::
+ Do not report commits up to (and including) limit.
+
Author
------
Written by Junio C Hamano <junkio@cox.net>
diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt
index 644bf126fb..ac938d39df 100644
--- a/Documentation/git-clone.txt
+++ b/Documentation/git-clone.txt
@@ -3,7 +3,7 @@ git-clone(1)
NAME
----
-git-clone - Clones a repository into a new directory
+git-clone - Clone a repository into a new directory
SYNOPSIS
diff --git a/Documentation/git-prune.txt b/Documentation/git-prune.txt
index 0b44f3015d..b8166a210f 100644
--- a/Documentation/git-prune.txt
+++ b/Documentation/git-prune.txt
@@ -3,7 +3,7 @@ git-prune(1)
NAME
----
-git-prune - Prunes all unreachable objects from the object database
+git-prune - Prune all unreachable objects from the object database
SYNOPSIS
diff --git a/Documentation/tutorial.txt b/Documentation/tutorial.txt
index f55d4083ed..118ff72869 100644
--- a/Documentation/tutorial.txt
+++ b/Documentation/tutorial.txt
@@ -132,8 +132,8 @@ and newly modified files, and in both cases it takes a snapshot of the
given files and stages that content in the index, ready for inclusion in
the next commit.
-Viewing the changelog
----------------------
+Viewing project history
+-----------------------
At any point you can view the history of your changes using
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 7eaafa80e9..780f0f0ee6 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -27,7 +27,7 @@ $ man git-clone
See also <<git-quick-start>> for a brief overview of git commands,
without any explanation.
-Also, see <<todo>> for ways that you can help make this manual more
+Finally, see <<todo>> for ways that you can help make this manual more
complete.
@@ -921,6 +921,7 @@ echo "git diff --stat --summary -M v$last v$new > ../diffstat-$new"
and then he just cut-and-pastes the output commands after verifying that
they look OK.
+[[Finding-comments-with-given-content]]
Finding commits referencing a file with given content
-----------------------------------------------------
@@ -1682,7 +1683,7 @@ automatically set the default remote branch to pull from at the time
that a branch is created:
-------------------------------------------------
-$ git checkout --track -b origin/maint maint
+$ git checkout --track -b maint origin/maint
-------------------------------------------------
In addition to saving you keystrokes, "git pull" also helps you by
@@ -3669,11 +3670,11 @@ itself!
include::glossary.txt[]
[[git-quick-start]]
-Appendix A: Git Quick Start
-===========================
+Appendix A: Git Quick Reference
+===============================
-This is a quick summary of the major commands; the following chapters
-will explain how these work in more detail.
+This is a quick summary of the major commands; the previous chapters
+explain how these work in more detail.
[[quick-creating-a-new-repository]]
Creating a new repository
@@ -3951,3 +3952,7 @@ CVS, Subversion, and just imports of series of release tarballs.
More details on gitweb?
Write a chapter on using plumbing and writing scripts.
+
+Alternates, clone -reference, etc.
+
+git unpack-objects -r for recovery