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

Author: Junio C Hamano

.mailmap

@@ -35,7 +35,11 @@ Shawn O. Pearce <[email protected]>
 Theodore Ts'o <[email protected]>
 Tony Luck <[email protected]>
 Uwe Kleine-König <[email protected]>
+Uwe Kleine-König <[email protected]>
+Uwe Kleine-König <[email protected]>
+Uwe Kleine-König <[email protected]>
 Ville Skyttä <[email protected]>
 YOSHIFUJI Hideaki <[email protected]>
 anonymous <[email protected]>
 anonymous <[email protected]>
+Dana L. How <[email protected]>

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.

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

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