mirror of
https://github.com/rsteube/carapace-bin.git
synced 2025-05-05 15:32:53 +00:00
44 lines
2.5 KiB
Go
44 lines
2.5 KiB
Go
package cmd
|
|
|
|
import (
|
|
"github.com/spf13/cobra"
|
|
)
|
|
|
|
var mergeCmd = &cobra.Command{
|
|
Use: "merge",
|
|
Short: "Join two or more development histories together",
|
|
Run: func(cmd *cobra.Command, args []string) {
|
|
},
|
|
}
|
|
|
|
func init() {
|
|
mergeCmd.Flags().Bool("abort", false, "abort the current in-progress merge")
|
|
mergeCmd.Flags().Bool("allow-unrelated-histories", false, "allow merging unrelated histories")
|
|
mergeCmd.Flags().String("cleanup", "", "how to strip spaces and #comments from message")
|
|
mergeCmd.Flags().Bool("commit", false, "perform a commit if the merge succeeds (default)")
|
|
mergeCmd.Flags().Bool("continue", false, "continue the current in-progress merge")
|
|
mergeCmd.Flags().BoolP("edit", "e", false, "edit message before committing")
|
|
mergeCmd.Flags().Bool("ff", false, "allow fast-forward (default)")
|
|
mergeCmd.Flags().BoolP("file", "F", false, "<path> read message from file")
|
|
mergeCmd.Flags().Bool("ff-only", false, "abort if fast-forward is not possible")
|
|
mergeCmd.Flags().String("log", "", "add (at most <n>) entries from shortlog to merge commit message")
|
|
mergeCmd.Flags().BoolP("message", "m", false, "<message> merge commit message (for a non-fast-forward merge)")
|
|
mergeCmd.Flags().BoolP("n", "n", false, "do not show a diffstat at the end of the merge")
|
|
mergeCmd.Flags().Bool("no-verify", false, "bypass pre-merge-commit and commit-msg hooks")
|
|
mergeCmd.Flags().Bool("overwrite-ignore", false, "update ignored files (default)")
|
|
mergeCmd.Flags().Bool("progress", false, "force progress reporting")
|
|
mergeCmd.Flags().BoolP("quiet", "q", false, "be more quiet")
|
|
mergeCmd.Flags().Bool("quit", false, "--abort but leave index and working tree alone")
|
|
mergeCmd.Flags().Bool("rerere-autoupdate", false, "update the index with reused conflict resolution if possible")
|
|
mergeCmd.Flags().StringP("gpg-sign", "S", "", "GPG sign commit")
|
|
mergeCmd.Flags().Bool("signoff", false, "add Signed-off-by:")
|
|
mergeCmd.Flags().Bool("squash", false, "create a single commit instead of doing a merge")
|
|
mergeCmd.Flags().BoolP("strategy", "s", false, "<strategy> merge strategy to use")
|
|
mergeCmd.Flags().Bool("stat", false, "show a diffstat at the end of the merge")
|
|
mergeCmd.Flags().Bool("summary", false, "(synonym to --stat)")
|
|
mergeCmd.Flags().Bool("verify-signatures", false, "verify that the named commit has a valid GPG signature")
|
|
mergeCmd.Flags().BoolP("verbose", "v", false, "be more verbose")
|
|
mergeCmd.Flags().BoolP("strategy-option", "X", false, "<option=value> option for selected merge strategy")
|
|
rootCmd.AddCommand(mergeCmd)
|
|
}
|