diff options
| author | Guido Günther <agx@sigxcpu.org> | 2010-07-03 23:33:50 +0200 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2010-07-04 17:24:48 +0200 |
| commit | fc270b564fab9e9b24b02cb006c7aa6fe00c1285 (patch) | |
| tree | de556f21e8904da79a24c812a3f92d922c61fe1b /git-import-dsc | |
| parent | 719f1aee1526273e7852639079f0ab65e129ad34 (diff) | |
Drop --no-merge
We don't invoke 'git merge' anymore.
Diffstat (limited to 'git-import-dsc')
| -rwxr-xr-x | git-import-dsc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/git-import-dsc b/git-import-dsc index 03cdc42a..705b3966 100755 --- a/git-import-dsc +++ b/git-import-dsc @@ -164,9 +164,6 @@ def main(argv): dest="debian_branch") branch_group.add_config_file_option(option_name="upstream-branch", dest="upstream_branch") - branch_group.add_option("--no-merge", dest='merge', action="store_false", - default=True, - help="after import dont do any merging to another branch") tag_group.add_boolean_config_file_option(option_name="sign-tags", dest="sign_tags") |