Andrew's git / gitweb.git / diff
?
Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Tue, 12 Jun 2007 07:15:16 +0000 (00:15 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 12 Jun 2007 07:15:16 +0000 (00:15 -0700)
* maint:
Unquote From line from patch before comparing with given from address.
git-cherry: Document 'limit' command-line option

1  2 
Documentation/git-cherry.txt patch | diff1 | diff2 | blob | history
GIT-VERSION-GEN patch | diff1 | diff2 | blob | history
diff --combined Documentation/git-cherry.txt
index b62c97097f1d66a26767a304a59b83bca7b727ee,8c7d9670d3b31353cd0b5a9bc76e63f7a4a7d7a1..e6943822cd1c003d666178ea26f7b24e56ad210f
--- 1/Documentation/git-cherry.txt
--- 2/Documentation/git-cherry.txt
+++ b/Documentation/git-cherry.txt
@@@ -53,6 -53,9 +53,9 @@@ OPTION
  <head>::
        Working branch; defaults to HEAD.
  
+ <limit>::
+       Do not report commits up to (and including) limit.
+ 
  Author
  ------
  Written by Junio C Hamano <junkio@cox.net>
@@@ -64,3 -67,4 +67,3 @@@ Documentation by Junio C Hamano and th
  GIT
  ---
  Part of the gitlink:git[7] suite
 -
diff --combined GIT-VERSION-GEN
index 289c8067b507095b18fc7be60772756ff740385d,bd30398dd3bb83cf9b91f465c3ae67c365d8e9a6..06c360b267f0d9e459e44ccaa81dd16b4384c627
--- 1/GIT-VERSION-GEN
--- 2/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@@ -1,7 -1,7 +1,7 @@@
  #!/bin/sh
  
  GVF=GIT-VERSION-FILE
 -DEF_VER=v1.5.2.1.GIT
 +DEF_VER=v1.5.2.GIT
  
  LF='
  '
@@@ -43,3 -43,5 +43,5 @@@ test "$VN" = "$VC" || 
        echo >&2 "GIT_VERSION = $VN"
        echo "GIT_VERSION = $VN" >$GVF
  }
+ 
+