From 6fe05fa772ec8e566a23990af8e0a545cbd89f4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= Date: Sun, 7 Jun 2026 17:51:39 +0200 Subject: [PATCH] fix(git-completion): add missing completion for git rebase --show-current-patch and --quit Closes #12805 --- localization/po/de.po | 6 ++++++ localization/po/es.po | 6 ++++++ localization/po/fr.po | 6 ++++++ localization/po/ja_JP.po | 6 ++++++ localization/po/pl.po | 6 ++++++ localization/po/pt_BR.po | 6 ++++++ localization/po/sv.po | 6 ++++++ localization/po/zh_CN.po | 6 ++++++ localization/po/zh_TW.po | 6 ++++++ share/completions/git.fish | 2 ++ 10 files changed, 56 insertions(+) diff --git a/localization/po/de.po b/localization/po/de.po index 1fb0b0132..e463a5470 100644 --- a/localization/po/de.po +++ b/localization/po/de.po @@ -5069,6 +5069,9 @@ msgstr "" msgid "Abort the rebase operation" msgstr "" +msgid "Abort the rebase operation but keep HEAD where it is" +msgstr "" + msgid "Abort without restoring branch" msgstr "" @@ -60230,6 +60233,9 @@ msgstr "" msgid "Show the package source RPM name" msgstr "" +msgid "Show the patch file being applied or merged" +msgstr "" + msgid "Show the plain metadata.xml file" msgstr "" diff --git a/localization/po/es.po b/localization/po/es.po index b4954d779..34daca12e 100644 --- a/localization/po/es.po +++ b/localization/po/es.po @@ -5069,6 +5069,9 @@ msgstr "" msgid "Abort the rebase operation" msgstr "" +msgid "Abort the rebase operation but keep HEAD where it is" +msgstr "" + msgid "Abort without restoring branch" msgstr "" @@ -60230,6 +60233,9 @@ msgstr "" msgid "Show the package source RPM name" msgstr "" +msgid "Show the patch file being applied or merged" +msgstr "" + msgid "Show the plain metadata.xml file" msgstr "" diff --git a/localization/po/fr.po b/localization/po/fr.po index dec3153d9..6d2f6ac12 100644 --- a/localization/po/fr.po +++ b/localization/po/fr.po @@ -5198,6 +5198,9 @@ msgstr "Annuler la résolution de conflits en cours" msgid "Abort the rebase operation" msgstr "Annuler le rebasage" +msgid "Abort the rebase operation but keep HEAD where it is" +msgstr "" + msgid "Abort without restoring branch" msgstr "" @@ -60359,6 +60362,9 @@ msgstr "" msgid "Show the package source RPM name" msgstr "" +msgid "Show the patch file being applied or merged" +msgstr "" + msgid "Show the plain metadata.xml file" msgstr "" diff --git a/localization/po/ja_JP.po b/localization/po/ja_JP.po index 83fd44f15..7acd30799 100644 --- a/localization/po/ja_JP.po +++ b/localization/po/ja_JP.po @@ -5072,6 +5072,9 @@ msgstr "" msgid "Abort the rebase operation" msgstr "" +msgid "Abort the rebase operation but keep HEAD where it is" +msgstr "" + msgid "Abort without restoring branch" msgstr "" @@ -60233,6 +60236,9 @@ msgstr "" msgid "Show the package source RPM name" msgstr "" +msgid "Show the patch file being applied or merged" +msgstr "" + msgid "Show the plain metadata.xml file" msgstr "" diff --git a/localization/po/pl.po b/localization/po/pl.po index 1e8b105be..25f6ee0c2 100644 --- a/localization/po/pl.po +++ b/localization/po/pl.po @@ -5065,6 +5065,9 @@ msgstr "" msgid "Abort the rebase operation" msgstr "" +msgid "Abort the rebase operation but keep HEAD where it is" +msgstr "" + msgid "Abort without restoring branch" msgstr "" @@ -60226,6 +60229,9 @@ msgstr "" msgid "Show the package source RPM name" msgstr "" +msgid "Show the patch file being applied or merged" +msgstr "" + msgid "Show the plain metadata.xml file" msgstr "" diff --git a/localization/po/pt_BR.po b/localization/po/pt_BR.po index 36d8f9df3..31aad1708 100644 --- a/localization/po/pt_BR.po +++ b/localization/po/pt_BR.po @@ -5070,6 +5070,9 @@ msgstr "" msgid "Abort the rebase operation" msgstr "" +msgid "Abort the rebase operation but keep HEAD where it is" +msgstr "" + msgid "Abort without restoring branch" msgstr "" @@ -60231,6 +60234,9 @@ msgstr "" msgid "Show the package source RPM name" msgstr "" +msgid "Show the patch file being applied or merged" +msgstr "" + msgid "Show the plain metadata.xml file" msgstr "" diff --git a/localization/po/sv.po b/localization/po/sv.po index 38898c7c0..c1eecfcf2 100644 --- a/localization/po/sv.po +++ b/localization/po/sv.po @@ -5066,6 +5066,9 @@ msgstr "" msgid "Abort the rebase operation" msgstr "" +msgid "Abort the rebase operation but keep HEAD where it is" +msgstr "" + msgid "Abort without restoring branch" msgstr "" @@ -60227,6 +60230,9 @@ msgstr "" msgid "Show the package source RPM name" msgstr "" +msgid "Show the patch file being applied or merged" +msgstr "" + msgid "Show the plain metadata.xml file" msgstr "" diff --git a/localization/po/zh_CN.po b/localization/po/zh_CN.po index 1cf5ecac5..6e9df8198 100644 --- a/localization/po/zh_CN.po +++ b/localization/po/zh_CN.po @@ -5090,6 +5090,9 @@ msgstr "" msgid "Abort the rebase operation" msgstr "" +msgid "Abort the rebase operation but keep HEAD where it is" +msgstr "" + msgid "Abort without restoring branch" msgstr "" @@ -60251,6 +60254,9 @@ msgstr "" msgid "Show the package source RPM name" msgstr "" +msgid "Show the patch file being applied or merged" +msgstr "" + msgid "Show the plain metadata.xml file" msgstr "" diff --git a/localization/po/zh_TW.po b/localization/po/zh_TW.po index 2f4c7d9ca..80ac9ce28 100644 --- a/localization/po/zh_TW.po +++ b/localization/po/zh_TW.po @@ -5067,6 +5067,9 @@ msgstr "" msgid "Abort the rebase operation" msgstr "" +msgid "Abort the rebase operation but keep HEAD where it is" +msgstr "" + msgid "Abort without restoring branch" msgstr "" @@ -60228,6 +60231,9 @@ msgstr "" msgid "Show the package source RPM name" msgstr "" +msgid "Show the patch file being applied or merged" +msgstr "" + msgid "Show the plain metadata.xml file" msgstr "" diff --git a/share/completions/git.fish b/share/completions/git.fish index 606070319..dd6c070d8 100644 --- a/share/completions/git.fish +++ b/share/completions/git.fish @@ -2181,6 +2181,8 @@ complete -f -c git -n '__fish_git_using_command rebase' -n __fish_git_is_rebasin complete -f -c git -n '__fish_git_using_command rebase' -n __fish_git_is_rebasing -l abort -d 'Abort the rebase operation' complete -f -c git -n '__fish_git_using_command rebase' -n __fish_git_is_rebasing -l edit-todo -d 'Edit the todo list' complete -f -c git -n '__fish_git_using_command rebase' -n __fish_git_is_rebasing -l skip -d 'Restart the rebasing process by skipping the current patch' +complete -f -c git -n '__fish_git_using_command rebase' -n __fish_git_is_rebasing -l show-current-patch -d 'Show the patch file being applied or merged' +complete -f -c git -n '__fish_git_using_command rebase' -n __fish_git_is_rebasing -l quit -d 'Abort the rebase operation but keep HEAD where it is' complete -f -c git -n '__fish_git_using_command rebase' -l keep-empty -d "Keep the commits that don't change anything" complete -f -c git -n '__fish_git_using_command rebase' -l keep-base -d 'Keep the base commit as-is' complete -f -c git -n '__fish_git_using_command rebase' -s m -l merge -d 'Use merging strategies to rebase'