aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--gbp/config.py4
-rwxr-xr-xgit-dch1
2 files changed, 4 insertions, 1 deletions
diff --git a/gbp/config.py b/gbp/config.py
index 0f167e2a..0cff3576 100644
--- a/gbp/config.py
+++ b/gbp/config.py
@@ -68,7 +68,9 @@ class GbpOptionParser(OptionParser):
'filter':
"files to filter out during import (can be given multiple times)",
'git-author':
- "use name and email from git-config for changelog trailer, default is '%(git-author)s'"
+ "use name and email from git-config for changelog trailer, default is '%(git-author)s'",
+ 'no-git-author':
+ "negates git-author",
}
config_files = [ '/etc/git-buildpackage/gbp.conf',
os.path.expanduser('~/.gbp.conf'),
diff --git a/git-dch b/git-dch
index b426a60d..1b0e34d9 100755
--- a/git-dch
+++ b/git-dch
@@ -288,6 +288,7 @@ def main(argv):
version_group.add_option("-N", "--new-version", dest="new_version",
help="use this as base for the new version number")
version_group.add_config_file_option(option_name="git-author", dest="git_author", action="store_true")
+ version_group.add_config_file_option(option_name="no-git-author", dest="git_author", action="store_false")
commit_group.add_config_file_option(option_name="meta", dest="meta",
help="parse meta tags in commit messages, default is '%(meta)s'", action="store_true")
commit_group.add_config_file_option(option_name="meta-closes", dest="meta_closes",