diff options
| author | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2011-02-05 01:24:34 +0100 |
|---|---|---|
| committer | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2011-02-05 01:24:34 +0100 |
| commit | 0f49c4e1336138ee8909bc76ad636878d067e60e (patch) | |
| tree | 4397ff3c3f0b56b437814c7e662197cfba6580a4 /src/fedpkg.bash | |
| parent | 2580fd3d05d6e2d0c13cf0dbfecb09302a381937 (diff) | |
| parent | 18ea3c13dc5bcda0c086efe11809795773f5167b (diff) | |
| download | fedora-packager-0f49c4e1336138ee8909bc76ad636878d067e60e.tar.gz fedora-packager-0f49c4e1336138ee8909bc76ad636878d067e60e.tar.xz fedora-packager-0f49c4e1336138ee8909bc76ad636878d067e60e.zip | |
Merge branch '5/initial-merge' into 5/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 90cb2ac..da37740 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 @@ -110,10 +110,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" |