diff options
| author | Jiang Xin <worldhello.net@gmail.com> | 2012-04-28 20:30:50 +0800 |
|---|---|---|
| committer | Jiang Xin <worldhello.net@gmail.com> | 2012-04-28 20:30:50 +0800 |
| commit | b240ea25a97d1b96acc4d0f5ae0dbcbe9e0af860 (patch) | |
| tree | da951e1c145cc094a6e5d634141f03b809bf3aff /Documentation/git-commit.txt | |
| parent | l10n: Add the German translation team and initialize de.po (diff) | |
| parent | Start preparing for 1.7.10.1 (diff) | |
| download | git-b240ea25a97d1b96acc4d0f5ae0dbcbe9e0af860.tar.gz git-b240ea25a97d1b96acc4d0f5ae0dbcbe9e0af860.zip | |
Merge maint branch for tracking l10n updates of git stable version
Use master branch to track l10n updates for git next release, while
use maint branch to track l10n updates for git stable version.
Diffstat (limited to 'Documentation/git-commit.txt')
| -rw-r--r-- | Documentation/git-commit.txt | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt index 5cc84a1391..68abfcacca 100644 --- a/Documentation/git-commit.txt +++ b/Documentation/git-commit.txt @@ -132,11 +132,14 @@ OPTIONS -t <file>:: --template=<file>:: - Use the contents of the given file as the initial version - of the commit message. The editor is invoked and you can - make subsequent changes. If a message is specified using - the `-m` or `-F` options, this option has no effect. This - overrides the `commit.template` configuration variable. + When editing the commit message, start the editor with the + contents in the given file. The `commit.template` configuration + variable is often used to give this option implicitly to the + command. This mechanism can be used by projects that want to + guide participants with some hints on what to write in the message + in what order. If the user exits the editor without editing the + message, the commit is aborted. This has no effect when a message + is given by other means, e.g. with the `-m` or `-F` options. -s:: --signoff:: |