From 560d21cd8664dfa0d5b39822b8949fff7a35b03a Mon Sep 17 00:00:00 2001
From: may <m4rch3n1ng@gmail.com>
Date: Wed, 16 Jul 2025 15:49:38 +0200
Subject: [PATCH 1/2] complete git rebase --keep-base

---
 share/completions/git.fish | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/share/completions/git.fish b/share/completions/git.fish
index 903f3e58a..9783b1996 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -2023,8 +2023,9 @@ __fish_git_add_revision_completion -n '__fish_git_using_command rebase'
 complete -f -c git -n '__fish_git_using_command rebase' -n __fish_git_is_rebasing -l continue -d 'Restart the rebasing process'
 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' -l keep-empty -d "Keep the commits that don't change anything"
 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' -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'
 complete -f -c git -n '__fish_git_using_command rebase' -s q -l quiet -d 'Be quiet'
 complete -f -c git -n '__fish_git_using_command rebase' -s v -l verbose -d 'Be verbose'

From 95475c35ff043705fb660bc5751cf4c7f9418e3f Mon Sep 17 00:00:00 2001
From: may <m4rch3n1ng@gmail.com>
Date: Wed, 16 Jul 2025 16:36:09 +0200
Subject: [PATCH 2/2] update translation files

---
 po/de.po    | 3 +++
 po/en.po    | 3 +++
 po/fr.po    | 3 +++
 po/pl.po    | 3 +++
 po/pt_BR.po | 3 +++
 po/sv.po    | 3 +++
 po/zh_CN.po | 3 +++
 7 files changed, 21 insertions(+)

diff --git a/po/de.po b/po/de.po
index 8867da3cc..f4edb4bd6 100644
--- a/po/de.po
+++ b/po/de.po
@@ -31797,6 +31797,9 @@ msgstr ""
 msgid "Keep the backing chain relatively referenced"
 msgstr ""
 
+msgid "Keep the base commit as-is"
+msgstr ""
+
 msgid "Keep the commits that don't change anything"
 msgstr ""
 
diff --git a/po/en.po b/po/en.po
index 083cc15a0..0d625b339 100644
--- a/po/en.po
+++ b/po/en.po
@@ -31793,6 +31793,9 @@ msgstr ""
 msgid "Keep the backing chain relatively referenced"
 msgstr ""
 
+msgid "Keep the base commit as-is"
+msgstr ""
+
 msgid "Keep the commits that don't change anything"
 msgstr ""
 
diff --git a/po/fr.po b/po/fr.po
index 615eb1666..6d5ed2dd6 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -31894,6 +31894,9 @@ msgstr ""
 msgid "Keep the backing chain relatively referenced"
 msgstr ""
 
+msgid "Keep the base commit as-is"
+msgstr ""
+
 msgid "Keep the commits that don't change anything"
 msgstr ""
 
diff --git a/po/pl.po b/po/pl.po
index 14c42cf06..ada5188d2 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -31789,6 +31789,9 @@ msgstr ""
 msgid "Keep the backing chain relatively referenced"
 msgstr ""
 
+msgid "Keep the base commit as-is"
+msgstr ""
+
 msgid "Keep the commits that don't change anything"
 msgstr ""
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 8859a3969..4ef31e797 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -31804,6 +31804,9 @@ msgstr ""
 msgid "Keep the backing chain relatively referenced"
 msgstr ""
 
+msgid "Keep the base commit as-is"
+msgstr ""
+
 msgid "Keep the commits that don't change anything"
 msgstr ""
 
diff --git a/po/sv.po b/po/sv.po
index eec18c771..4a9c98c87 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -31792,6 +31792,9 @@ msgstr ""
 msgid "Keep the backing chain relatively referenced"
 msgstr ""
 
+msgid "Keep the base commit as-is"
+msgstr ""
+
 msgid "Keep the commits that don't change anything"
 msgstr ""
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 56f1c58f8..6a1f3bca8 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -31792,6 +31792,9 @@ msgstr "关闭文件后继续激活应用程序"
 msgid "Keep the backing chain relatively referenced"
 msgstr "保持支持链相对引用"
 
+msgid "Keep the base commit as-is"
+msgstr ""
+
 msgid "Keep the commits that don't change anything"
 msgstr "保持承诺不会改变任何事情"