From 6f52c017ba9c234594a48cf215f5ad861f13c81b Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Thu, 22 Jul 2021 08:16:07 +0530 Subject: [PATCH] Resolve all conversations --- share/completions/git.fish | 62 ++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 32 deletions(-) diff --git a/share/completions/git.fish b/share/completions/git.fish index 6f614f1ff..995478d9f 100644 --- a/share/completions/git.fish +++ b/share/completions/git.fish @@ -858,6 +858,7 @@ complete -c git -n '__fish_git_using_command diff show range-diff log' -l relati complete -c git -n '__fish_git_using_command diff show range-diff' -l shortstat -d 'Output only the last line of the --stat format containing total number of modified files' complete -c git -n '__fish_git_using_command diff show range-diff log' -l src-prefix -d 'Show the given source prefix instead of "a/"' complete -c git -n '__fish_git_using_command diff show range-diff' -l stat -d 'Generate a diffstat' +complete -c git -n '__fish_git_using_command diff show range-diff apply' -l stat -d 'Generate a diffstat' complete -c git -n '__fish_git_using_command diff show range-diff' -l summary -d 'Output a condensed summary of extended header information' complete -c git -n '__fish_git_using_command diff show range-diff' -l textconv -d 'Allow external text conversion filters to be run when comparing binary files' complete -c git -n '__fish_git_using_command diff show range-diff' -l word-diff -d 'Show a word diff' @@ -986,26 +987,18 @@ complete -f -c git -n '__fish_git_using_command add' -a '(__fish_git_files modif ### am complete -F -c git -n __fish_git_needs_command -a am -d 'Apply a series of patches from a mailbox' complete -f -c git -n '__fish_git_using_command am' -s s -l signoff -d 'Add a Signed-off-By trailer to commit message' -complete -f -c git -n '__fish_git_using_command am' -s k -l keep -d 'Pass -k to git mailinfo' -complete -f -c git -n '__fish_git_using_command am' -l keep-non-patch -d 'Pass -b to git mailinfo' -complete -f -c git -n '__fish_git_using_command am' -l keep-cr -d 'Pass --keep-cr to git mailsplit' +complete -f -c git -n '__fish_git_using_command am' -l keep-non-patch -d 'Only strip bracket pairs containing \'PATCH\'' complete -f -c git -n '__fish_git_using_command am' -l no-keep-cr -d 'Override am.keepcr to false' complete -f -c git -n '__fish_git_using_command am' -s c -l scissors -d 'Remove everything in body before scissors' complete -f -c git -n '__fish_git_using_command am' -l no-scissors -d 'Ignore scissor lines' -complete -x -c git -n '__fish_git_using_command am' -l quoted-cr -a 'nowarn warn strip' -d 'Action when processed email message end with CRLF instead of LF' -complete -f -c git -n '__fish_git_using_command am' -s m -l message-id -d 'Pass the -m flag to git mailinfo' +complete -x -c git -n '__fish_git_using_command am' -l quoted-cr -a 'nowarn warn strip' -d 'What to do when an email ends with CRLF' complete -f -c git -n '__fish_git_using_command am' -l no-messageid -d 'Do not add message id to commit message' complete -f -c git -n '__fish_git_using_command am' -s q -l quiet -d 'Supress logs' -complete -f -c git -n '__fish_git_using_command am' -s u -l utf8 -d 'Pass -u to git mailinfo' -complete -f -c git -n '__fish_git_using_command am' -l no-utf8 -d 'Pass -n to git mailinfo' +complete -f -c git -n '__fish_git_using_command am' -l no-utf8 -d 'Disable all charset re-encoding of metadata' complete -f -c git -n '__fish_git_using_command am' -s 3 -l 3way -d 'Fall back to three way merge on patch failure' complete -f -c git -n '__fish_git_using_command am' -l no-3way -d 'Do not fall back to three way merge on patch failure' complete -f -c git -n '__fish_git_using_command am' -l rerere-autoupdate -d 'Allow rerere to update index if possible' complete -f -c git -n '__fish_git_using_command am' -l ignore-space-change -d 'Pass --ignore-space-change to git apply' -complete -f -c git -n '__fish_git_using_command am' -l ignore-whitespace -d 'Pass --ignore-whitespace to git apply' -complete -x -c git -n '__fish_git_using_command am' -l whitespace -a 'nowarn warn fix error error-all' -d 'Pass --whitespace git apply' -complete -x -c git -n '__fish_git_using_command am' -s C -d 'Pass -C to git apply' -complete -x -c git -n '__fish_git_using_command am' -s p -d 'Pass -p to git apply' complete -F -c git -n '__fish_git_using_command am' -l directory -d 'Pass --directory to git apply' complete -F -c git -n '__fish_git_using_command am' -l exclude -d 'Pass --exclude to git apply' complete -F -c git -n '__fish_git_using_command am' -l include -d 'Pass --include to git apply' @@ -1015,13 +1008,13 @@ complete -f -c git -n '__fish_git_using_command am' -s i -l interactive -d 'Run complete -f -c git -n '__fish_git_using_command am' -l commiter-date-is-author-date -d 'Treat commiter date as author date' complete -f -c git -n '__fish_git_using_command am' -l ignore-date -d 'Treat author date as commiter date' complete -f -c git -n '__fish_git_using_command am' -l skip -d 'Skip current patch' -complete -x -c git -n '__fish_git_using_command am' -s S -l gpg-sign -a '(__fish_complete_gpg_key_id gpg)' -d 'Sign commits with gpg' +complete -x -c git -n '__fish_git_using_command am' -s S -l gpg-sign -a '(type -q gpg && __fish_complete_gpg_key_id gpg)' -d 'Sign commits with gpg' complete -f -c git -n '__fish_git_using_command am' -l no-gpg-sign -d 'Do not sign commits' complete -f -c git -n '__fish_git_using_command am' -s r -l resolved -l continue -d 'Mark patch failures as resolved' -complete -x -c git -n '__fish_git_using_command am' -l resolvemsg -d 'Message to print when patch failure occurs' -complete -f -c git -n '__fish_git_using_command am' -l abort -d 'Abort l patch operation and restore branch' +complete -x -c git -n '__fish_git_using_command am' -l resolvemsg -d 'Message to print after patch failure' +complete -f -c git -n '__fish_git_using_command am' -l abort -d 'Abort patch operation and restore branch' complete -f -c git -n '__fish_git_using_command am' -l quit -d 'Abort without restoring branch' -complete -x -c git -n '__fish_git_using_command am' -l show-current-patch -a 'diff raw' -d 'Show message at which patch failures occured' +complete -c git -n '__fish_git_using_command am' -l show-current-patch -a 'diff raw' -d 'Show message at which patch failures occured' ### checkout complete -F -c git -n '__fish_git_using_command checkout; and contains -- -- (commandline -opc)' @@ -1040,7 +1033,6 @@ complete -f -c git -n '__fish_git_using_command checkout' -l ours -d 'Keep unmer ### apply complete -F -c git -n __fish_git_needs_command -a apply -d 'Apply a patch on a git index file and a working tree' -complete -f -c git -n '__fish_git_using_command apply' -l stat -d 'Output diff stat' complete -f -c git -n '__fish_git_using_command apply' -l numstat -d 'Show number of additions and deletions' complete -f -c git -n '__fish_git_using_command apply' -l summary -d 'Output a condensed summary' complete -f -c git -n '__fish_git_using_command apply' -l check -d 'Just check if the patches can be applied' @@ -1052,20 +1044,20 @@ complete -F -c git -n '__fish_git_using_command apply' -l build-fake-ancestor -d complete -f -c git -n '__fish_git_using_command apply' -s R -l reverse -d 'Apply the patch in reverse' complete -f -c git -n '__fish_git_using_command apply' -l reject -d 'Leave rejected hunks in *.rej files' complete -f -c git -n '__fish_git_using_command apply; and __fish_contains_opt numstat' -s z -d 'Do not munge pathnames' -complete -x -c git -n '__fish_git_using_command apply' -s p -d 'Remove n leading path components' -complete -x -c git -n '__fish_git_using_command apply' -s C -d 'Ensure n that lines of surrounding context match' +complete -x -c git -n '__fish_git_using_command apply am' -s p -d 'Remove n leading path components' +complete -x -c git -n '__fish_git_using_command apply am' -s C -d 'Ensure n that lines of surrounding context match' complete -f -c git -n '__fish_git_using_command apply' -l unidiff-zero -d 'Do not break on diffs generated using --unified=0' complete -f -c git -n '__fish_git_needs_command apply' -l apply -d 'Always apply patches' complete -f -c git -n '__fish_git_using_command apply' -l no-add -d 'Ignore additions made by patches' complete -f -c git -n '__fish_git_using_command apply' -l allow-binary-replacement -l binary -d 'Also patch binaries' complete -F -c git -n '__fish_git_using_command apply' -l exclude -d 'Dont apply changes to files matching given pattern' complete -F -c git -n '__fish_git_using_command apply' -l include -d 'Apply changes to files matching given pattern' -complete -f -c git -n '__fish_git_using_command apply' -l ignore-space-change -l ignore-whitespace -d 'Ignore whitespace change in context lines' -complete -x -c git -n '__fish_git_using_command apply' -l whitespace -a 'nowarn warn fix error error-all' -d 'Action to take when there are whitespace errors' -complete -f -c git -n '__fish_git_using_command apply' -l inaccurate-eof -d 'Workaround for some versionw of diff not detecting new line at end of file' +complete -f -c git -n '__fish_git_using_command apply am' -l ignore-space-change -l ignore-whitespace -d 'Ignore whitespace change in context lines' +complete -x -c git -n '__fish_git_using_command apply am' -l whitespace -a 'nowarn warn fix error error-all' -d 'Action to take when there are whitespace errors' +complete -f -c git -n '__fish_git_using_command apply' -l inaccurate-eof -d 'Work around some diff versions not detecting newlines at end of file' complete -f -c git -n '__fish_git_using_command apply' -s v -l verbose -d 'Report progress to stderr' complete -f -c git -n '__fish_git_using_command apply' -l recount -d 'Do not trust the line counts in the hunk headers' -complete -F -c git -n '__fish_git_using_command apply' -l directort -d 'Prepend to all filenames' +complete -F -c git -n '__fish_git_using_command apply' -l directory -d 'Prepend given path to all filenames' complete -f -c git -n '__fish_git_using_command apply' -l unsafe-paths -d 'Allow patches that work outside working area' @@ -1158,8 +1150,8 @@ complete -f -c git -n '__fish_git_using_command count-objects' -s H -l human-rea complete -c git -n __fish_git_needs_command -a daemon -d 'A really simple server for git repositories' complete -f -c git -n '__fish_git_using_command daemon' -l strict-paths -d 'Match paths exactly' complete -F -c git -n '__fish_git_using_command daemon' -l base-path -d 'Git Root' -complete -f -c git -n '__fish_git_using_command daemon' -l base-path-relaxed -d 'Relax base-path' -complete -F -c git -n '__fish_git_using_command daemon' -l interpolated-path -d 'Interpolated path template' +complete -f -c git -n '__fish_git_using_command daemon' -l base-path-relaxed -d 'When looking up with base path fails, try without it' +complete -F -c git -n '__fish_git_using_command daemon' -l interpolated-path -d 'Construct a path from the given template' complete -f -c git -n '__fish_git_using_command daemon' -l export-all -d 'Allow pulling from all directories' complete -f -c git -n '__fish_git_using_command daemon' -l inetd -d 'Run as inetd service' complete -x -c git -n '__fish_git_using_command daemon' -l listen -d 'Listen on this IP' @@ -1176,8 +1168,8 @@ complete -f -c git -n '__fish_git_using_command daemon' -l detach -d 'Detach fro complete -x -c git -n '__fish_git_using_command daemon' -l reuseaddr -d 'Save the process id in file' complete -x -c git -n '__fish_git_using_command daemon' -l user -d 'Change daemon\'s uid' complete -x -c git -n '__fish_git_using_command daemon' -l group -d 'Change daemon\'s gid' -complete -x -c git -n '__fish_git_using_command daemon' -l enable -a 'upload-pack upload-archive recieve-pack' -d 'Enable service' -complete -x -c git -n '__fish_git_using_command daemon' -l disable -a 'upload-pack upload-archive recieve-pack' -d 'Disable service' +complete -x -c git -n '__fish_git_using_command daemon' -l enable -a 'upload-pack upload-archive receive-pack' -d 'Enable service' +complete -x -c git -n '__fish_git_using_command daemon' -l disable -a 'upload-pack upload-archive receive-pack' -d 'Disable service' complete -x -c git -n '__fish_git_using_command daemon' -l allow-override -a 'upload-pack upload-archive recieve-pack' -d 'Allow overriding site-wide default per repository configuration' complete -x -c git -n '__fish_git_using_command daemon' -l forbid-override -a 'upload-pack upload-archive recieve-pack' -d 'Forbid overriding site-wide drfault per repository configuration' complete -f -c git -n '__fish_git_using_command daemon' -l informative-errors -d 'Report more verbose errors to clients' @@ -1461,12 +1453,12 @@ complete -c git -n '__fish_git_using_command ls-files' -l eol -d 'Show ### mailinfo complete -f -c git -n __fish_git_needs_command -a mailinfo -d 'Extracts patch and authorship from a single e-mail message' -complete -f -c git -n '__fish_git_using_command mailinfo' -s k -d 'Do not remove email cruft' -complete -f -c git -n '__fish_git_using_command mailinfo' -s b -d 'Limit stripping of pair brackets' -complete -f -c git -n '__fish_git_using_command mailinfo' -s u -d 'Do not reencode author name and email' +complete -f -c git -n '__fish_git_using_command mailinfo am' -s k -d 'Do not remove email cruft from subject' +complete -f -c git -n '__fish_git_using_command mailinfo' -s b -d 'Only strip bracket pairs containing \'PATCH\'' +complete -f -c git -n '__fish_git_using_command mailinfo am' -s u -d 'Do not reencode author name and email' complete -x -c git -n '__fish_git_using_command mailinfo' -l encoding -d 'Re-encode to given charset' complete -f -c git -n '__fish_git_using_command mailinfo' -s n -d 'Disable all charset re-encoding of metadata' -complete -f -c git -n '__fish_git_using_command mailinfo' -s m -l message-id -d 'Copy message id to the end of commit message' +complete -f -c git -n '__fish_git_using_command mailinfo am' -s m -l message-id -d 'Copy message id to the end of commit message' complete -f -c git -n '__fish_git_using_command mailinfo' -l scissors -d 'Remove everything above scissor line' complete -f -c git -n '__fish_git_using_command mailinfo' -l no-scissors -d 'Ignore scissor lines' complete -x -c git -n '__fish_git_using_command mailinfo' -l quoted-cr -a 'nowarn warn strip' -d 'Action when processed email message end with CRLF instead of LF' @@ -1477,7 +1469,7 @@ complete -F -c git -n '__fish_git_using_command mailsplit' -s o -d 'Directory to complete -f -c git -n '__fish_git_using_command mailsplit' -s b -d 'Treat files not starting with From line as single mail message' complete -x -c git -n '__fish_git_using_command mailsplit' -s d -d 'File name prefix digit precision' complete -x -c git -n '__fish_git_using_command mailsplit' -s f -d 'Skip first n numbers' -complete -f -c git -n '__fish_git_using_command mailsplit' -l keep-cr -d 'Do not remove \\r from lines starting with \\n\\r' +complete -f -c git -n '__fish_git_using_command mailsplit am' -l keep-cr -d 'Do not remove \\r from lines starting with \\n\\r' complete -f -c git -n '__fish_git_using_command mailsplit' -l mboxrd -d 'Input is of mboxrd form' ### maintenance @@ -1575,7 +1567,13 @@ complete -f -c git -n "__fish_git_using_command notes; and __fish_seen_subcomman complete -f -c git -n "__fish_git_using_command notes; and __fish_seen_subcommand_from copy remove" -l stdin -d 'Read object names from stdin' complete -f -c git -n "__fish_git_using_command notes; and __fish_seen_subcommand_from merge remove prune" -s v -l verbose -d 'Be more verbose' complete -f -c git -n "__fish_git_using_command notes; and __fish_seen_subcommand_from merge remove prune" -s q -l quiet -d 'Operate quietly' -complete -x -c git -n "__fish_git_using_command notes; and __fish_seen_subcommand_from merge " -s s -l strategy -a 'manual ours theirs union cat_sort_uniq' -d 'Merge strategy to use to resolve conflicts' +complete -x -c git -n "__fish_git_using_command notes; and __fish_seen_subcommand_from merge" -s s -l strategy -d 'Merge strategy to use to resolve conflicts' -a " + manual\t'Instruct the user to resolve merge conflicts' + ours\t'Resolve conflicts in favour of local version' + theirs\t'Resolve conflicts in favour of remote version' + union\t'Resolve conflicts by concatenating local and remote versions' + cat_sort_uniq\t'Concatenate, sort and remove duplicate lines' + " complete -f -c git -n "__fish_git_using_command notes; and __fish_seen_subcommand_from merge" -l commit -d 'Finalize git notes merge' complete -f -c git -n "__fish_git_using_command notes; and __fish_seen_subcommand_from merge" -l abort -d 'Abort git notes merge' complete -f -c git -n "__fish_git_using_command notes; and __fish_seen_subcommand_from remove" -l ignore-missing -d 'Do not throw error on deleting non-existing object note'