Skip to content

Commit b836490

Browse files
committed
Merge branch 'maint'
* maint: Documentation: git-send-mail can take rev-list arg to drive format-patch rebase--interactive: remote stray closing parenthesis
2 parents cb9d398 + 94af7c3 commit b836490

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

Documentation/git-send-email.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ SYNOPSIS
1414
DESCRIPTION
1515
-----------
1616
Takes the patches given on the command line and emails them out.
17+
Patches can be specified as files, directories (which will send all
18+
files in the directory), or directly as a revision list. In the
19+
last case, any format accepted by linkgit:git-format-patch[1] can
20+
be passed to git send-email.
1721

1822
The header of the email is configurable by command line options. If not
1923
specified on the command line, the user will be prompted with a ReadLine

git-rebase--interactive.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ do_next () {
420420
NEWHEAD=$(git rev-parse HEAD) &&
421421
case $HEADNAME in
422422
refs/*)
423-
message="$GIT_REFLOG_ACTION: $HEADNAME onto $SHORTONTO)" &&
423+
message="$GIT_REFLOG_ACTION: $HEADNAME onto $SHORTONTO" &&
424424
git update-ref -m "$message" $HEADNAME $NEWHEAD $OLDHEAD &&
425425
git symbolic-ref HEAD $HEADNAME
426426
;;

0 commit comments

Comments
 (0)