summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2007-05-10 13:52:54 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2007-05-10 13:52:54 -0700
commitefa615ba089e88c0d2645f444373751de0529214 (patch)
treea08456ab6dbf43dcd382a50fcc4589ea66d5d67a /Documentation
parentgitweb: choose appropriate view for file type if a= parameter missing (diff)
parent.mailmap: add some aliases (diff)
downloadtgif-efa615ba089e88c0d2645f444373751de0529214.tar.xz
Merge branch 'maint'
* maint: .mailmap: add some aliases SPECIFYING RANGES typo fix: it it => it is git-clone: don't get fooled by $PWD Fix documentation of tag in git-fast-import.txt
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-fast-import.txt1
-rw-r--r--Documentation/git-rev-parse.txt2
2 files changed, 1 insertions, 2 deletions
diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt
index eaba6fd4c1..8d06775a6b 100644
--- a/Documentation/git-fast-import.txt
+++ b/Documentation/git-fast-import.txt
@@ -548,7 +548,6 @@ lightweight (non-annotated) tags see the `reset` command below.
'from' SP <committish> LF
'tagger' SP <name> SP LT <email> GT SP <when> LF
data
- LF
....
where `<name>` is the name of the tag to create.
diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt
index a8bf6561e1..7757abe621 100644
--- a/Documentation/git-rev-parse.txt
+++ b/Documentation/git-rev-parse.txt
@@ -255,7 +255,7 @@ reachable from `r1` from the set of commits reachable from
A similar notation "`r1\...r2`" is called symmetric difference
of `r1` and `r2` and is defined as
"`r1 r2 --not $(git-merge-base --all r1 r2)`".
-It it the set of commits that are reachable from either one of
+It is the set of commits that are reachable from either one of
`r1` or `r2` but not from both.
Two other shorthands for naming a set that is formed by a commit