Merge branch 'maint'

* maint:
  Documentation: git-send-mail can take rev-list arg to drive format-patch
  rebase--interactive: remote stray closing parenthesis
This commit is contained in:
Junio C Hamano 2009-06-11 23:35:46 -07:00
commit b8364903c3
2 changed files with 5 additions and 1 deletions

View File

@ -14,6 +14,10 @@ SYNOPSIS
DESCRIPTION DESCRIPTION
----------- -----------
Takes the patches given on the command line and emails them out. Takes the patches given on the command line and emails them out.
Patches can be specified as files, directories (which will send all
files in the directory), or directly as a revision list. In the
last case, any format accepted by linkgit:git-format-patch[1] can
be passed to git send-email.
The header of the email is configurable by command line options. If not The header of the email is configurable by command line options. If not
specified on the command line, the user will be prompted with a ReadLine specified on the command line, the user will be prompted with a ReadLine

View File

@ -420,7 +420,7 @@ do_next () {
NEWHEAD=$(git rev-parse HEAD) && NEWHEAD=$(git rev-parse HEAD) &&
case $HEADNAME in case $HEADNAME in
refs/*) refs/*)
message="$GIT_REFLOG_ACTION: $HEADNAME onto $SHORTONTO)" && message="$GIT_REFLOG_ACTION: $HEADNAME onto $SHORTONTO" &&
git update-ref -m "$message" $HEADNAME $NEWHEAD $OLDHEAD && git update-ref -m "$message" $HEADNAME $NEWHEAD $OLDHEAD &&
git symbolic-ref HEAD $HEADNAME git symbolic-ref HEAD $HEADNAME
;; ;;