aboutsummaryrefslogtreecommitdiff
path: root/git-dch
diff options
context:
space:
mode:
authorGuido Guenther <agx@sigxcpu.org>2007-10-11 14:30:18 +0200
committerGuido Guenther <agx@sigxcpu.org>2007-10-11 14:30:18 +0200
commit09751bce5528c0803006bf8261e66ee9e5956f9d (patch)
tree8c0c7d02442a0aa99e50fde7df7f367133cb6993 /git-dch
parent63fc12515195a7307700192e246b585ba0cb4072 (diff)
make --git-log a config file option
Diffstat (limited to 'git-dch')
-rwxr-xr-xgit-dch3
1 files changed, 2 insertions, 1 deletions
diff --git a/git-dch b/git-dch
index 4f64e084..dc8e711a 100755
--- a/git-dch
+++ b/git-dch
@@ -198,6 +198,8 @@ def main(argv):
help="Format string for debian tags, default is '%(debian-tag)s'")
parser.add_config_file_option(option_name="snapshot-number", dest="snapshot_number",
help="Expression to determine the next snapshot number, default is '%(snapshot-number)s'")
+ parser.add_config_file_option(option_name="git-log", dest="git_log",
+ help="options to pass to git-log")
parser.add_option("-v", "--verbose", action="store_true", dest="verbose", default=False,
help="verbose command execution")
parser.add_option("-s", "--since", dest="since", help="commit to start from")
@@ -207,7 +209,6 @@ def main(argv):
help="mark as snapshot build")
parser.add_option("-a", "--auto", action="store_true", dest="auto", default=False,
help="autocomplete changelog from last snapshot or tag")
- parser.add_option("--git-log", dest="git_log", help="options to pass to git-log", default="--no-merges")
(options, args) = parser.parse_args(argv[1:])
if options.snapshot and options.release: