aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-12-10 13:07:12 -0800
committerJunio C Hamano <gitster@pobox.com>2012-12-10 13:07:12 -0800
commit7e0651a6302b50db4bac1e65da61c4036cc64d2a (patch)
tree76318c5dee03db57953017fd095d2d198acced09
parentdd6fc7ca91f79f9cee70943e64c4a4d4569ca4dd (diff)
parent3e53891f85c58b4adb016a429a1f3b7fae78ca03 (diff)
downloadgit-7e0651a6302b50db4bac1e65da61c4036cc64d2a.tar.gz
git-7e0651a6302b50db4bac1e65da61c4036cc64d2a.tar.xz
Sync with 1.8.0.2
* maint: Git 1.8.0.2 Documentation/git-stash.txt: add a missing verb git(1): remove a defunct link to "list of authors" Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/git-stash.txt2
-rw-r--r--Documentation/git.txt6
2 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt
index 0aa4e20ea..711ffe17a 100644
--- a/Documentation/git-stash.txt
+++ b/Documentation/git-stash.txt
@@ -144,7 +144,7 @@ drop [-q|--quiet] [<stash>]::
Remove a single stashed state from the stash list. When no `<stash>`
is given, it removes the latest one. i.e. `stash@{0}`, otherwise
- `<stash>` must a valid stash log reference of the form
+ `<stash>` must be a valid stash log reference of the form
`stash@{<revision>}`.
create::
diff --git a/Documentation/git.txt b/Documentation/git.txt
index cbe088353..e643683b3 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -43,9 +43,10 @@ unreleased) version of git, that is available from 'master'
branch of the `git.git` repository.
Documentation for older releases are available here:
-* link:v1.8.0.1/git.html[documentation for release 1.8.0.1]
+* link:v1.8.0.2/git.html[documentation for release 1.8.0.2]
* release notes for
+ link:RelNotes/1.8.0.2.txt[1.8.0.2],
link:RelNotes/1.8.0.1.txt[1.8.0.1],
link:RelNotes/1.8.0.txt[1.8.0].
@@ -868,8 +869,7 @@ Authors
-------
Git was started by Linus Torvalds, and is currently maintained by Junio
C Hamano. Numerous contributions have come from the git mailing list
-<git@vger.kernel.org>. For a more complete list of contributors, see
-http://git-scm.com/about. If you have a clone of git.git itself, the
+<git@vger.kernel.org>. If you have a clone of git.git itself, the
output of linkgit:git-shortlog[1] and linkgit:git-blame[1] can show you
the authors for specific parts of the project.