diff options
Diffstat (limited to 'argvAutoshell.go')
| -rw-r--r-- | argvAutoshell.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/argvAutoshell.go b/argvAutoshell.go index e1afaae..6d2bb96 100644 --- a/argvAutoshell.go +++ b/argvAutoshell.go @@ -45,6 +45,8 @@ func (args) doBashAuto() { fmt.Println("fix") case "list": fmt.Println("--full") + case "merge": + fmt.Println("devel master") case "pull": fmt.Println("dirty clean list patches sync --force") case "--find": @@ -64,7 +66,7 @@ func (args) doBashAuto() { default: if argv.BashAuto[0] == ARGNAME { // list the subcommands here - fmt.Println("--bash list checkout commit config dirty debug fetch patch pull") + fmt.Println("--bash list checkout commit config dirty debug fetch merge patch pull") } } os.Exit(0) |