Add "fedpkg initial-merge" command

usage: fedpkg.py initial-merge [-h] [-n] [repo-path [repo-path ...]]

Performs a 'git merge' of all git branches with the same content
(i.e. with the same package spec files, patch files, etc.), regardless
of their history.

This is useful after Fedora's dist-cvs to dist-git migration, as often
different branches have different histories but the same content on the
filesystem.

After these initial merges of identical trees, future merges between
the branches will be a lot easier: Easier to follow in the dependency
graph, and easier to perform without conflicts.

positional arguments:
  repo-path      Path to a repo to initial-merge

optional arguments:
  -h, --help     show this help message and exit
  -n, --dry-run  Whether to run without actually merging

1 files changed, 4 insertions, 1 deletions

diff --git a/src/fedpkg.bash b/src/fedpkg.bash
index 90cb2ac..5a20446 100644
--- a/src/fedpkg.bash
+++ b/src/fedpkg.bash
@@ -36,7 +36,7 @@ _fedpkg()
     local options="--help -v -q"
     local options_value="--dist --user --path"
     local commands="build chain-build ci clean clog clone co commit compile diff gimmespec giturl help \
-    import install lint local mockbuild new new-sources patch prep pull push retire scratch-build sources \
+    import initial-merge install lint local mockbuild new new-sources patch prep pull push retire scratch-build sources \
     srpm switch-branch tag tag-request unused-patches update upload verrel"
 
     # parse main options and get command
@@ -114,6 +114,9 @@ _fedpkg()
             options_branch="-b"
             after="package"
             ;;
+        initial-merge)
+            options="--dry-run"
+            ;;
         commit|ci)
             options="--push --clog --tag"
             options_string="--message"