diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-05-10 13:52:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-05-10 13:52:54 -0700 |
| commit | efa615ba089e88c0d2645f444373751de0529214 (patch) | |
| tree | a08456ab6dbf43dcd382a50fcc4589ea66d5d67a | |
| parent | 7f9778b19b07601ae8134fc4ff23b7bf7cac28bd (diff) | |
| parent | b722b9585518c9d75ec5d8731cb90dc0c9fb918c (diff) | |
| download | git-efa615ba089e88c0d2645f444373751de0529214.tar.gz | |
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
| -rw-r--r-- | .mailmap | 4 | ||||
| -rw-r--r-- | Documentation/git-fast-import.txt | 1 | ||||
| -rw-r--r-- | Documentation/git-rev-parse.txt | 2 | ||||
| -rwxr-xr-x | git-clone.sh | 9 |
4 files changed, 13 insertions, 3 deletions
@@ -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 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 diff --git a/git-clone.sh b/git-clone.sh index cad5c0c088..70374aaaf0 100755 --- 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 |