diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-06-11 23:35:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-11 23:35:46 -0700 |
| commit | b8364903c3e4cde713102e4a36d3926b020b0f70 (patch) | |
| tree | 51d782d83a624a1e9331944c4484b5ce3c1e9b46 | |
| parent | cb9d398c3506a6354a1c63d265a4228fcec28fda (diff) | |
| parent | 94af7c31a52ba1a26bd663c794e33284acf41a49 (diff) | |
| download | git-b8364903c3e4cde713102e4a36d3926b020b0f70.tar.gz git-b8364903c3e4cde713102e4a36d3926b020b0f70.tar.xz | |
Merge branch 'maint'
* maint:
Documentation: git-send-mail can take rev-list arg to drive format-patch
rebase--interactive: remote stray closing parenthesis
| -rw-r--r-- | Documentation/git-send-email.txt | 4 | ||||
| -rwxr-xr-x | git-rebase--interactive.sh | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt index 7c5ce415c..e7cb0e6c7 100644 --- a/Documentation/git-send-email.txt +++ b/Documentation/git-send-email.txt @@ -14,6 +14,10 @@ SYNOPSIS DESCRIPTION ----------- 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 specified on the command line, the user will be prompted with a ReadLine diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 314cd364b..f96d887d2 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -420,7 +420,7 @@ do_next () { NEWHEAD=$(git rev-parse HEAD) && case $HEADNAME in refs/*) - message="$GIT_REFLOG_ACTION: $HEADNAME onto $SHORTONTO)" && + message="$GIT_REFLOG_ACTION: $HEADNAME onto $SHORTONTO" && git update-ref -m "$message" $HEADNAME $NEWHEAD $OLDHEAD && git symbolic-ref HEAD $HEADNAME ;; |