diff options
| author | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2010-08-08 19:34:22 +0200 |
|---|---|---|
| committer | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2010-08-08 19:34:22 +0200 |
| commit | 28a23f4f766f5f223ad93fe76fc209c6a6160a69 (patch) | |
| tree | ca5f64b7db5abdc82f460bb26b1c1579a7650dc5 | |
| parent | 57d5f2d932cce6895a7fe7307d241c35c0caa0c7 (diff) | |
| download | fedora-packager-28a23f4f766f5f223ad93fe76fc209c6a6160a69.tar.gz fedora-packager-28a23f4f766f5f223ad93fe76fc209c6a6160a69.tar.xz fedora-packager-28a23f4f766f5f223ad93fe76fc209c6a6160a69.zip | |
Remove quotes from merge commit message
| -rwxr-xr-x | src/pyfedpkg/initial_merge.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/pyfedpkg/initial_merge.py b/src/pyfedpkg/initial_merge.py index 18ec3a8..dc81c32 100755 --- a/src/pyfedpkg/initial_merge.py +++ b/src/pyfedpkg/initial_merge.py @@ -107,7 +107,7 @@ def do_initial_merge(into, to_merge): pyfedpkg.switch_branch(into.localbranch) repo = git.Repo() print "Merging", [ x.origbranch for x in to_merge], "into", into.localbranch - repo.git.merge(*(['-m', '"Initial peudo merge for dist-git setup"', + repo.git.merge(*(['-m', 'Initial peudo merge for dist-git setup', '-s', 'ours'] + [ x.origbranch for x in to_merge])) for t in to_merge: |