diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-02-19 23:44:07 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-02-19 23:44:07 -0800 |
| commit | 8c5b85ce87d15e4db37a6408f03b0eb71dde080e (patch) | |
| tree | 71b226a7452da6d52d07a60c9957424cd64d0a19 /Documentation | |
| parent | 7d233dea5f4e299fdac8d6cfb610bcd4d60a82b7 (diff) | |
| parent | e43a6fd3e94888d76779ad79fb568ed180e5fcdf (diff) | |
| download | git-8c5b85ce87d15e4db37a6408f03b0eb71dde080e.tar.gz git-8c5b85ce87d15e4db37a6408f03b0eb71dde080e.tar.xz | |
Merge branch 'maint'
* maint:
More friendly message when locking the index fails.
Document git blame --reverse.
Documentation: Note file formats send-email accepts
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/blame-options.txt | 7 | ||||
| -rw-r--r-- | Documentation/git-blame.txt | 2 | ||||
| -rw-r--r-- | Documentation/git-send-email.txt | 13 |
3 files changed, 21 insertions, 1 deletions
diff --git a/Documentation/blame-options.txt b/Documentation/blame-options.txt index 1ab1b96cf..7f2843225 100644 --- a/Documentation/blame-options.txt +++ b/Documentation/blame-options.txt @@ -41,6 +41,13 @@ of lines before or after the line given by <start>. -S <revs-file>:: Use revs from revs-file instead of calling linkgit:git-rev-list[1]. +--reverse:: + Walk history forward instead of backward. Instead of showing + the revision in which a line appeared, this shows the last + revision in which a line has existed. This requires a range of + revision like START..END where the path to blame exists in + START. + -p:: --porcelain:: Show in a format designed for machine consumption. diff --git a/Documentation/git-blame.txt b/Documentation/git-blame.txt index 6999cf2a6..4ef54d660 100644 --- a/Documentation/git-blame.txt +++ b/Documentation/git-blame.txt @@ -10,7 +10,7 @@ SYNOPSIS [verse] 'git blame' [-c] [-b] [-l] [--root] [-t] [-f] [-n] [-s] [-p] [-w] [--incremental] [-L n,m] [-S <revs-file>] [-M] [-C] [-C] [--since=<date>] - [<rev> | --contents <file>] [--] <file> + [<rev> | --contents <file> | --reverse <rev>] [--] <file> DESCRIPTION ----------- diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt index ff4aeff4e..66bf3b2fc 100644 --- a/Documentation/git-send-email.txt +++ b/Documentation/git-send-email.txt @@ -19,6 +19,19 @@ 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 enabled interface to provide the necessary information. +There are two formats accepted for patch files: + +1. mbox format files ++ +This is what linkgit:git-format-patch[1] generates. Most headers and MIME +formatting are ignored. + +2. The original format used by Greg Kroah-Hartman's 'send_lots_of_email.pl' +script ++ +This format expects the first line of the file to contain the "Cc:" value +and the "Subject:" of the message as the second line. + OPTIONS ------- |