diff options
author | Matthijs Kooijman <matthijs@stdin.nl> | 2010-02-05 12:57:48 +0100 |
---|---|---|
committer | Guido Günther <agx@sigxcpu.org> | 2010-02-05 17:41:24 +0100 |
commit | 2874c2331c7d24eac5f38febe3a38964ed7dac42 (patch) | |
tree | 10c6a03bd7af54d5873ff07199d702d4346a126c /docs | |
parent | 46544253084cb31ebcbec4bf969c99215cca10a7 (diff) | |
download | git-buildpackage-2874c2331c7d24eac5f38febe3a38964ed7dac42.tar.gz git-buildpackage-2874c2331c7d24eac5f38febe3a38964ed7dac42.tar.bz2 git-buildpackage-2874c2331c7d24eac5f38febe3a38964ed7dac42.zip |
Make the commit message for upstream imports configurable.
This adds the import-msg commandline and configuration file option to
change the commit message.
Closes: #474457
Diffstat (limited to 'docs')
-rw-r--r-- | docs/chapters/import.sgml | 7 | ||||
-rw-r--r-- | docs/manpages/git-import-orig.sgml | 9 |
2 files changed, 16 insertions, 0 deletions
diff --git a/docs/chapters/import.sgml b/docs/chapters/import.sgml index 3da7bd35..079ea334 100644 --- a/docs/chapters/import.sgml +++ b/docs/chapters/import.sgml @@ -74,6 +74,13 @@ by version number. (orig.tar.gz) from &git; you should also specify the <option>--pristine-tar</option> option. This is recommended. </para> + <para>To customize the commit message used by &git-import-orig; use + the <option>--import-msg</option> option. This string is a standard + python format string, into which the + <replaceable>version</replaceable> variable is interpolated. (i.e., + use <replaceable>%(version)s</replaceable> in your message to get + the imported upstream version). + </para> </sect1> <sect1 id="gbp.import.convert"> diff --git a/docs/manpages/git-import-orig.sgml b/docs/manpages/git-import-orig.sgml index 84811b48..102f3831 100644 --- a/docs/manpages/git-import-orig.sgml +++ b/docs/manpages/git-import-orig.sgml @@ -119,6 +119,15 @@ </listitem> </varlistentry> <varlistentry> + <term><option>--import-msg=</option><replaceable>msg-format</replaceable> + </term> + <listitem> + <para>use this format string for the commit message when + importing upstream versions, default is <replaceable>Imported + Upstream version %(version)s</replaceable></para> + </listitem> + </varlistentry> + <varlistentry> <term><option>--filter=</option><replaceable>pattern</replaceable> </term> <listitem> |