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

diff --git a/.mailmap b/.mailmap
index 17e89af11847381cf6c5c21344fb09eec8776b34..4e0615e9beb06928e9440e3dd60014cc265f9ee5 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -35,7 +35,11 @@ Shawn O. Pearce <spearce@spearce.org>
 Theodore Ts'o <tytso@mit.edu>
 Tony Luck <tony.luck@intel.com>
 Uwe Kleine-König <zeisberg@informatik.uni-freiburg.de>
+Uwe Kleine-König <Uwe_Zeisberger@digi.com>
+Uwe Kleine-König <uzeisberger@io.fsforth.de>
+Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
 Ville Skyttä <scop@xemacs.org>
 YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
 anonymous <linux@horizon.com>
 anonymous <linux@horizon.net>
+Dana L. How <how@deathvalley.cswitch.com>

diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt
index eaba6fd4c168564f43ce2db3994dcb7b70bd4b54..8d06775a6bd5f4ac8bd5a20fba67f76c121380ee 100644 (file)
--- 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 a8bf6561e1d8059f12d1a548cf74dc4815e6a34f..7757abe62190a066b6ad8b57214b70ff3fa0f12a 100644 (file)
--- 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

diff --git a/git-clone.sh b/git-clone.sh
index cad5c0c088fa997c6f8f36c44e8888a5cb19515e..70374aaaf0f766588739053becc36831381d4f35 100755 (executable)
--- a/git-clone.sh
+++ b/git-clone.sh
@@ -18,7 +18,14 @@ usage() {
 }
 
 get_repo_base() {
-       (cd "$1" && (cd .git ; pwd)) 2> /dev/null
+       (
+               cd "`/bin/pwd`" &&
+               cd "$1" &&
+               {
+                       cd .git 2>/dev/null
+                       pwd
+               }
+       )
 }
 
 if [ -n "$GIT_SSL_NO_VERIFY" ]; then