diff options
| author | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2011-01-21 11:09:39 +0100 |
|---|---|---|
| committer | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2011-01-21 11:09:39 +0100 |
| commit | 7a70e8ab79d46d06271c75be1f726fd164cbf9ce (patch) | |
| tree | d11f53e95819d9252e434e46f36f7effbc5f2c8b /src/fedpkg.bash | |
| parent | 06fda5ee1e0338330e44bc0d08ca5026e4fb5618 (diff) | |
| parent | 39b9be927e4cbbfeed1ee2e28a1badde0db5c19d (diff) | |
| download | fedora-packager-4/ALL.tar.gz fedora-packager-4/ALL.tar.xz fedora-packager-4/ALL.zip | |
Merge branch '4/initial-merge' into 4/ALL4/ALL
Diffstat (limited to 'src/fedpkg.bash')
| -rw-r--r-- | src/fedpkg.bash | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/fedpkg.bash b/src/fedpkg.bash index 117bd23..fe709a2 100644 --- a/src/fedpkg.bash +++ b/src/fedpkg.bash @@ -36,7 +36,7 @@ _fedpkg() local options="--help -v -q" local options_value="--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 @@ -108,10 +108,13 @@ _fedpkg() options="--dry-run -x" ;; clone|co) - options="--branches --anonymous" + options="--branches --anonymous --initial-merge" options_branch="-b" after="package" ;; + initial-merge) + options="--dry-run" + ;; commit|ci) options="--push --clog --tag" options_string="--message" |