Skip to content

Commit

Permalink
Merge pull request #2469 from carapace-sh/git-fix-relative-flag
Browse files Browse the repository at this point in the history
git: fix relative flag
  • Loading branch information
rsteube authored Aug 3, 2024
2 parents 8b4e925 + 584295f commit 1718c47
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 3 deletions.
2 changes: 1 addition & 1 deletion completers/git_completer/cmd/common/diff.go
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ func AddDiffFlags(cmd *cobra.Command) {
cmd.Flags().Bool("pickaxe-all", false, "When -S or -G finds a change, show all the changes in that changeset")
cmd.Flags().Bool("pickaxe-regex", false, "Treat the <string> given to -S as an extended POSIX regular expression to match")
cmd.Flags().Bool("raw", false, "Generate the diff in raw format")
cmd.Flags().String("relative,", "", "exclude changes outside the directory")
cmd.Flags().String("relative", "", "exclude changes outside the directory")
cmd.Flags().Bool("rename-empty", false, "Whether to use empty blobs as rename source")
cmd.Flags().Bool("shortstat", false, "Output only the last line of the --stat format")
cmd.Flags().String("src-prefix", "", "Show the given source prefix instead of \"a/\"")
Expand Down
1 change: 0 additions & 1 deletion completers/git_completer/cmd/diffFiles.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ func init() {
diffFilesCmd.Flags().Bool("no-relative", false, "Do not show relative pathnames")
diffFilesCmd.Flags().Bool("no-textconv", false, "Disallow external text conversion filters to be run when comparing binary files")
diffFilesCmd.Flags().BoolS("q", "q", false, "Remain silent even for nonexistent files")
diffFilesCmd.Flags().String("relative", "", "Show relative pathnames")
diffFilesCmd.Flags().String("rotate-to", "", "Move the files before the named <file> to the end")
diffFilesCmd.Flags().String("skip-to", "", "Discard the files before the named <file> from the output")
diffFilesCmd.Flags().Bool("use-mailmap", false, "Use mailmap file to map author and committer name")
Expand Down
1 change: 0 additions & 1 deletion completers/git_completer/cmd/log.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ func init() {
logCmd.Flags().Bool("no-textconv", false, "Disallow external text conversion filters to be run when comparing binary files.")
logCmd.Flags().Bool("no-use-mailmap", false, "Do not use mailmap file to map author and committer names and email addresses to canonical real names and email addresses.")
logCmd.Flags().String("notes", "", "Show the notes that annotate the commit")
logCmd.Flags().String("relative", "", "When run from a subdirectory of the project, it can be told to exclude changes outside the directory and show pathnames relative to it with this option.")
logCmd.Flags().Bool("reverse", false, "Output the commits chosen to be shown (see Commit Limiting section above) in reverse order. Cannot be combined with --walk-reflogs.")
logCmd.Flags().String("rotate-to", "", "Discard the files before the named <file> from the output (i.e. skip to), or move them to the end of the output (i.e. rotate to).")
logCmd.Flags().Bool("show-pulls", false, "Include all commits from the default mode, but also any merge commits that are not TREESAME to the first parent but are TREESAME to a later parent.")
Expand Down

0 comments on commit 1718c47

Please sign in to comment.