diff options
| author | Guido Günther <agx@sigxcpu.org> | 2011-10-23 13:40:07 +0200 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2011-10-23 16:20:33 +0200 |
| commit | 240ce9ffb29fc4fbfee071eff0bfa2e7ff795fd9 (patch) | |
| tree | 2e6a16e5e87d7126063eb08e9cbfb0765e7b8f50 /gbp/command_wrappers.py | |
| parent | e9e382ef3b26143787aa6d9d0b7a6d5df64c3057 (diff) | |
Replace GitMerge by GitRepository.merge()
Diffstat (limited to 'gbp/command_wrappers.py')
| -rw-r--r-- | gbp/command_wrappers.py | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/gbp/command_wrappers.py b/gbp/command_wrappers.py index b7682392..1fcfdbc3 100644 --- a/gbp/command_wrappers.py +++ b/gbp/command_wrappers.py @@ -240,15 +240,6 @@ class GitFetch(GitCommand): GitCommand.__init__(self, 'fetch', opts) -# FIXME: move to gbp.git.merge -class GitMerge(GitCommand): - """Wrap git merge""" - def __init__(self, branch, verbose=False): - verbose = [ ['--no-summary'], [] ][verbose] - GitCommand.__init__(self, 'merge', [branch] + verbose) - self.run_error = 'Couldn\'t merge from "%s"' % (branch,) - - # FIXME: move to gbp.git.create_tag class GitTag(GitCommand): """Wrap git tag""" |