From: Junio C Hamano Date: Tue, 12 Jun 2007 07:15:16 +0000 (-0700) Subject: Merge branch 'maint' X-Git-Tag: v1.5.3-rc0~116 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f26cacf4956b08238868b21a8eac6b5e51a17d7f?ds=inline;hp=-c Merge branch 'maint' * maint: Unquote From line from patch before comparing with given from address. git-cherry: Document 'limit' command-line option --- f26cacf4956b08238868b21a8eac6b5e51a17d7f diff --combined Documentation/git-cherry.txt index b62c97097f,8c7d9670d3..e6943822cd --- a/Documentation/git-cherry.txt +++ b/Documentation/git-cherry.txt @@@ -53,6 -53,9 +53,9 @@@ OPTION :: Working branch; defaults to HEAD. + :: + Do not report commits up to (and including) limit. + Author ------ Written by Junio C Hamano @@@ -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 289c8067b5,bd30398dd3..06c360b267 --- a/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 } + +