Skip to content

Commit

Permalink
Merge pull request carapace-sh#2123 from rsteube/git-diff-fix-flg
Browse files Browse the repository at this point in the history
git: diff - fix flag
  • Loading branch information
rsteube authored Jan 6, 2024
2 parents 1b627b4 + ab22ba8 commit 6905819
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion completers/git_completer/cmd/diff.go
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ func addDiffFlags(cmd *cobra.Command) {
cmd.Flags().String("submodule", "", "Specify how differences in submodules are shown")
cmd.Flags().Bool("summary", false, "Output a condensed summary of extended header information")
cmd.Flags().BoolP("text", "a", false, "Treat all files as text")
cmd.Flags().String("textconv,", "", "Allow (or disallow) external text conversion filters to be run when comparing binary files")
cmd.Flags().String("textconv", "", "Allow (or disallow) external text conversion filters to be run when comparing binary files")
cmd.Flags().BoolP("theirs", "3", false, "compare with their branch")
cmd.Flags().BoolS("u", "u", false, "Generate patch")
cmd.Flags().StringP("unified", "U", "", "Generate diffs with <n> lines of context instead of the usual three")
Expand Down

0 comments on commit 6905819

Please sign in to comment.