From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 8 May 2010 04:32:56 +0000 (-0700)
Subject: Merge branch 'jn/maint-request-pull' into jn/request-pull
X-Git-Tag: v1.7.2-rc0~114^2~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ea0edad58f58378cb42c2895c5578524bbaba296?ds=inline;hp=-c

Merge branch 'jn/maint-request-pull' into jn/request-pull
---

ea0edad58f58378cb42c2895c5578524bbaba296
diff --combined git-request-pull.sh
index 8fd15f6df4,b0a03111cc..74238b0313
--- a/git-request-pull.sh
+++ b/git-request-pull.sh
@@@ -8,6 -8,7 +8,7 @@@ USAGE='<start> <url> [<end>]
  LONG_USAGE='Summarizes the changes between two commits to the standard output,
  and includes the given URL in the generated summary.'
  SUBDIRECTORY_OK='Yes'
+ OPTIONS_KEEPDASHDASH=
  OPTIONS_SPEC='git request-pull [options] start url [end]
  --
  p    show patch text as well
@@@ -65,11 -66,11 +66,11 @@@ if [ -z "$branch" ]; the
  	status=1
  fi
  
 -echo "The following changes since commit $baserev:"
 -git shortlog --max-count=1 $baserev | sed -e 's/^\(.\)/  \1/'
 +git show -s --format='The following changes since commit %H:
  
 -echo "are available in the git repository at:"
 -echo
 +  %s (%ci)
 +
 +are available in the git repository at:' $baserev
  echo "  $url $branch"
  echo