From: Junio C Hamano <junkio@cox.net>
Date: Fri, 30 Mar 2007 06:44:30 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.1~16
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e8811929344c46aed7669e148527af054eb3e18b?hp=-c

Merge branch 'maint'

* maint:
git-upload-pack: make sure we close unused pipe ends
Documentation/git-rev-parse.txt: fix example in SPECIFYING RANGES.
Documentation/git-svnimport.txt: fix typo.
---

e8811929344c46aed7669e148527af054eb3e18b
diff --combined Documentation/git-rev-parse.txt
index ccc66aae7f,d0a2ad3088..a8bf6561e1
--- a/Documentation/git-rev-parse.txt
+++ b/Documentation/git-rev-parse.txt
@@@ -190,13 -190,6 +190,13 @@@ blobs contained in a commit
    and dereference the tag recursively until a non-tag object is
    found.
  
 +* A colon, followed by a slash, followed by a text: this names
 +  a commit whose commit message starts with the specified text.
 +  This name returns the youngest matching commit which is
 +  reachable from any ref.  If the commit message starts with a
 +  '!', you have to repeat that;  the special sequence ':/!',
 +  followed by something else than '!' is reserved for now.
 +
  * A suffix ':' followed by a path; this names the blob or tree
    at the given path in the tree-ish object named by the part
    before the colon.
@@@ -265,14 -258,14 +265,14 @@@ its all parents
  
  Here are a handful examples:
  
-    D                A B D
-    D F              A B C D F
-    ^A G             B D
-    ^A F             B C F
-    G...I            C D F G I
-    ^B G I           C D F G I
-    F^@              A B C
-    F^! H            D F H
+    D                G H D
+    D F              G H I J D F
+    ^G D             H D
+    ^D B             E I J F B
+    B...C            G H D E B C
+    ^D B C           E I J F B C
+    C^@              I J F
+    F^! D            G H D F
  
  Author
  ------