diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2016-07-04 16:20:15 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2016-07-04 16:58:03 +0000 |
| commit | 535f5dcb29ab1e8f4a17d03fb1168f76b4578d66 (patch) | |
| tree | cc432c5b0054a0edd9fdc016446d48a53d3aa632 /bin | |
| parent | 948b22ec61131e7d2755a2d12e10be1244a86e72 (diff) | |
git-qt-merge-mainlines: skip type=str (the default) from parser options
Change-Id: Ib237cd0dea97d6a750e490bf257de9f056533299
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/git-qt-merge-mainlines | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bin/git-qt-merge-mainlines b/bin/git-qt-merge-mainlines index 9ca71fa..bc4f853 100755 --- a/bin/git-qt-merge-mainlines +++ b/bin/git-qt-merge-mainlines @@ -240,12 +240,12 @@ sub-modules checked out (e.g. using qt5/init-repository). parser.add_argument('-s', '--status', action="store_true", help='show the status (which patches will be merged)') parser.add_argument('-d', '--merge', action="store_true", help='do the merge') parser.add_argument('-u', '--super', action="store_true", help='obtain sha1s from supermodule instead of using branch tips') - parser.add_argument('-m', '--modules', type=str, help='override the list of modules (eg. -m "qtbase qtdeclarative")') + parser.add_argument('-m', '--modules', help='override the list of modules (eg. -m "qtbase qtdeclarative")') parser.add_argument('-l', '--list-modules', action="store_true", help='list the modules to be merged and exit') parser.add_argument('--reset', action="store_true", help='reset to origin/to_branch. this is implicit in the merge command') - parser.add_argument('-f', '--branch-from', type=str, default='stable', help='from which branch to merge') - parser.add_argument('-t', '--branch-to', type=str, default='dev', help='the target branch') - parser.add_argument('-v', '--version', type=str, default='', help='set version in .qmake.conf to given version string') + parser.add_argument('-f', '--branch-from', default='stable', help='from which branch to merge') + parser.add_argument('-t', '--branch-to', default='dev', help='the target branch') + parser.add_argument('-v', '--version', default='', help='set version in .qmake.conf to given version string') parser.add_argument('--mergetool', action="store_true", help='run mergetool for conflicts') args = parser.parse_args(namespace=config) |