diff --git a/usr/bin/git-cvsserver b/usr/bin/git-cvsserver index 9b8ef5bd03e..5f0c05c3287 100755 --- a/usr/bin/git-cvsserver +++ b/usr/bin/git-cvsserver @@ -28,7 +28,7 @@ use File::Path qw/rmtree/; use File::Basename; use Getopt::Long qw(:config require_order no_ignore_case); -my $VERSION = '2.45.2'; +my $VERSION = '2.46.0'; my $log = GITCVS::log->new(); my $cfg; diff --git a/usr/bin/git-receive-pack.exe b/usr/bin/git-receive-pack.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/bin/git-receive-pack.exe and b/usr/bin/git-receive-pack.exe differ diff --git a/usr/bin/git-shell.exe b/usr/bin/git-shell.exe index b11f722eaa2..45c87c1bca3 100755 Binary files a/usr/bin/git-shell.exe and b/usr/bin/git-shell.exe differ diff --git a/usr/bin/git-upload-archive.exe b/usr/bin/git-upload-archive.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/bin/git-upload-archive.exe and b/usr/bin/git-upload-archive.exe differ diff --git a/usr/bin/git-upload-pack.exe b/usr/bin/git-upload-pack.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/bin/git-upload-pack.exe and b/usr/bin/git-upload-pack.exe differ diff --git a/usr/bin/git.exe b/usr/bin/git.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/bin/git.exe and b/usr/bin/git.exe differ diff --git a/usr/bin/scalar.exe b/usr/bin/scalar.exe index d00bbf5f778..0b488d0463d 100644 Binary files a/usr/bin/scalar.exe and b/usr/bin/scalar.exe differ diff --git a/usr/lib/git-core/git-add.exe b/usr/lib/git-core/git-add.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-add.exe and b/usr/lib/git-core/git-add.exe differ diff --git a/usr/lib/git-core/git-am.exe b/usr/lib/git-core/git-am.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-am.exe and b/usr/lib/git-core/git-am.exe differ diff --git a/usr/lib/git-core/git-annotate.exe b/usr/lib/git-core/git-annotate.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-annotate.exe and b/usr/lib/git-core/git-annotate.exe differ diff --git a/usr/lib/git-core/git-apply.exe b/usr/lib/git-core/git-apply.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-apply.exe and b/usr/lib/git-core/git-apply.exe differ diff --git a/usr/lib/git-core/git-archive.exe b/usr/lib/git-core/git-archive.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-archive.exe and b/usr/lib/git-core/git-archive.exe differ diff --git a/usr/lib/git-core/git-bisect.exe b/usr/lib/git-core/git-bisect.exe index 0d17a8fd942..c799fc33164 100644 Binary files a/usr/lib/git-core/git-bisect.exe and b/usr/lib/git-core/git-bisect.exe differ diff --git a/usr/lib/git-core/git-blame.exe b/usr/lib/git-core/git-blame.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-blame.exe and b/usr/lib/git-core/git-blame.exe differ diff --git a/usr/lib/git-core/git-branch.exe b/usr/lib/git-core/git-branch.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-branch.exe and b/usr/lib/git-core/git-branch.exe differ diff --git a/usr/lib/git-core/git-bugreport.exe b/usr/lib/git-core/git-bugreport.exe index 0d17a8fd942..c799fc33164 100644 Binary files a/usr/lib/git-core/git-bugreport.exe and b/usr/lib/git-core/git-bugreport.exe differ diff --git a/usr/lib/git-core/git-bundle.exe b/usr/lib/git-core/git-bundle.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-bundle.exe and b/usr/lib/git-core/git-bundle.exe differ diff --git a/usr/lib/git-core/git-cat-file.exe b/usr/lib/git-core/git-cat-file.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-cat-file.exe and b/usr/lib/git-core/git-cat-file.exe differ diff --git a/usr/lib/git-core/git-check-attr.exe b/usr/lib/git-core/git-check-attr.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-check-attr.exe and b/usr/lib/git-core/git-check-attr.exe differ diff --git a/usr/lib/git-core/git-check-ignore.exe b/usr/lib/git-core/git-check-ignore.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-check-ignore.exe and b/usr/lib/git-core/git-check-ignore.exe differ diff --git a/usr/lib/git-core/git-check-mailmap.exe b/usr/lib/git-core/git-check-mailmap.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-check-mailmap.exe and b/usr/lib/git-core/git-check-mailmap.exe differ diff --git a/usr/lib/git-core/git-check-ref-format.exe b/usr/lib/git-core/git-check-ref-format.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-check-ref-format.exe and b/usr/lib/git-core/git-check-ref-format.exe differ diff --git a/usr/lib/git-core/git-checkout--worker.exe b/usr/lib/git-core/git-checkout--worker.exe index 0d17a8fd942..c799fc33164 100644 Binary files a/usr/lib/git-core/git-checkout--worker.exe and b/usr/lib/git-core/git-checkout--worker.exe differ diff --git a/usr/lib/git-core/git-checkout-index.exe b/usr/lib/git-core/git-checkout-index.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-checkout-index.exe and b/usr/lib/git-core/git-checkout-index.exe differ diff --git a/usr/lib/git-core/git-checkout.exe b/usr/lib/git-core/git-checkout.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-checkout.exe and b/usr/lib/git-core/git-checkout.exe differ diff --git a/usr/lib/git-core/git-cherry-pick.exe b/usr/lib/git-core/git-cherry-pick.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-cherry-pick.exe and b/usr/lib/git-core/git-cherry-pick.exe differ diff --git a/usr/lib/git-core/git-cherry.exe b/usr/lib/git-core/git-cherry.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-cherry.exe and b/usr/lib/git-core/git-cherry.exe differ diff --git a/usr/lib/git-core/git-citool b/usr/lib/git-core/git-citool index 8e4dbf473d7..e122f648525 100755 --- a/usr/lib/git-core/git-citool +++ b/usr/lib/git-core/git-citool @@ -2318,7 +2318,7 @@ proc do_quit {{rc {1}}} { # set save [gitdir GITGUI_MSG] if {$GITGUI_BCK_exists && ![$ui_comm edit modified]} { - file rename -force [gitdir GITGUI_BCK] $save + catch { file rename -force [gitdir GITGUI_BCK] $save } set GITGUI_BCK_exists 0 } elseif {[$ui_comm edit modified]} { set msg [string trim [$ui_comm get 0.0 end]] diff --git a/usr/lib/git-core/git-clean.exe b/usr/lib/git-core/git-clean.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-clean.exe and b/usr/lib/git-core/git-clean.exe differ diff --git a/usr/lib/git-core/git-clone.exe b/usr/lib/git-core/git-clone.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-clone.exe and b/usr/lib/git-core/git-clone.exe differ diff --git a/usr/lib/git-core/git-column.exe b/usr/lib/git-core/git-column.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-column.exe and b/usr/lib/git-core/git-column.exe differ diff --git a/usr/lib/git-core/git-commit-graph.exe b/usr/lib/git-core/git-commit-graph.exe index 0d17a8fd942..c799fc33164 100644 Binary files a/usr/lib/git-core/git-commit-graph.exe and b/usr/lib/git-core/git-commit-graph.exe differ diff --git a/usr/lib/git-core/git-commit-tree.exe b/usr/lib/git-core/git-commit-tree.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-commit-tree.exe and b/usr/lib/git-core/git-commit-tree.exe differ diff --git a/usr/lib/git-core/git-commit.exe b/usr/lib/git-core/git-commit.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-commit.exe and b/usr/lib/git-core/git-commit.exe differ diff --git a/usr/lib/git-core/git-config.exe b/usr/lib/git-core/git-config.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-config.exe and b/usr/lib/git-core/git-config.exe differ diff --git a/usr/lib/git-core/git-count-objects.exe b/usr/lib/git-core/git-count-objects.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-count-objects.exe and b/usr/lib/git-core/git-count-objects.exe differ diff --git a/usr/lib/git-core/git-credential-cache--daemon.exe b/usr/lib/git-core/git-credential-cache--daemon.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-credential-cache--daemon.exe and b/usr/lib/git-core/git-credential-cache--daemon.exe differ diff --git a/usr/lib/git-core/git-credential-cache.exe b/usr/lib/git-core/git-credential-cache.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-credential-cache.exe and b/usr/lib/git-core/git-credential-cache.exe differ diff --git a/usr/lib/git-core/git-credential-store.exe b/usr/lib/git-core/git-credential-store.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-credential-store.exe and b/usr/lib/git-core/git-credential-store.exe differ diff --git a/usr/lib/git-core/git-credential.exe b/usr/lib/git-core/git-credential.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-credential.exe and b/usr/lib/git-core/git-credential.exe differ diff --git a/usr/lib/git-core/git-cvsserver b/usr/lib/git-core/git-cvsserver index 9b8ef5bd03e..5f0c05c3287 100755 --- a/usr/lib/git-core/git-cvsserver +++ b/usr/lib/git-core/git-cvsserver @@ -28,7 +28,7 @@ use File::Path qw/rmtree/; use File::Basename; use Getopt::Long qw(:config require_order no_ignore_case); -my $VERSION = '2.45.2'; +my $VERSION = '2.46.0'; my $log = GITCVS::log->new(); my $cfg; diff --git a/usr/lib/git-core/git-daemon.exe b/usr/lib/git-core/git-daemon.exe index 0efab8223b8..6b6155de914 100755 Binary files a/usr/lib/git-core/git-daemon.exe and b/usr/lib/git-core/git-daemon.exe differ diff --git a/usr/lib/git-core/git-describe.exe b/usr/lib/git-core/git-describe.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-describe.exe and b/usr/lib/git-core/git-describe.exe differ diff --git a/usr/lib/git-core/git-diagnose.exe b/usr/lib/git-core/git-diagnose.exe index 0d17a8fd942..c799fc33164 100644 Binary files a/usr/lib/git-core/git-diagnose.exe and b/usr/lib/git-core/git-diagnose.exe differ diff --git a/usr/lib/git-core/git-diff-files.exe b/usr/lib/git-core/git-diff-files.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-diff-files.exe and b/usr/lib/git-core/git-diff-files.exe differ diff --git a/usr/lib/git-core/git-diff-index.exe b/usr/lib/git-core/git-diff-index.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-diff-index.exe and b/usr/lib/git-core/git-diff-index.exe differ diff --git a/usr/lib/git-core/git-diff-tree.exe b/usr/lib/git-core/git-diff-tree.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-diff-tree.exe and b/usr/lib/git-core/git-diff-tree.exe differ diff --git a/usr/lib/git-core/git-diff.exe b/usr/lib/git-core/git-diff.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-diff.exe and b/usr/lib/git-core/git-diff.exe differ diff --git a/usr/lib/git-core/git-difftool.exe b/usr/lib/git-core/git-difftool.exe index 0d17a8fd942..c799fc33164 100644 Binary files a/usr/lib/git-core/git-difftool.exe and b/usr/lib/git-core/git-difftool.exe differ diff --git a/usr/lib/git-core/git-fast-export.exe b/usr/lib/git-core/git-fast-export.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-fast-export.exe and b/usr/lib/git-core/git-fast-export.exe differ diff --git a/usr/lib/git-core/git-fast-import.exe b/usr/lib/git-core/git-fast-import.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-fast-import.exe and b/usr/lib/git-core/git-fast-import.exe differ diff --git a/usr/lib/git-core/git-fetch-pack.exe b/usr/lib/git-core/git-fetch-pack.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-fetch-pack.exe and b/usr/lib/git-core/git-fetch-pack.exe differ diff --git a/usr/lib/git-core/git-fetch.exe b/usr/lib/git-core/git-fetch.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-fetch.exe and b/usr/lib/git-core/git-fetch.exe differ diff --git a/usr/lib/git-core/git-fmt-merge-msg.exe b/usr/lib/git-core/git-fmt-merge-msg.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-fmt-merge-msg.exe and b/usr/lib/git-core/git-fmt-merge-msg.exe differ diff --git a/usr/lib/git-core/git-for-each-ref.exe b/usr/lib/git-core/git-for-each-ref.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-for-each-ref.exe and b/usr/lib/git-core/git-for-each-ref.exe differ diff --git a/usr/lib/git-core/git-for-each-repo.exe b/usr/lib/git-core/git-for-each-repo.exe index 0d17a8fd942..c799fc33164 100644 Binary files a/usr/lib/git-core/git-for-each-repo.exe and b/usr/lib/git-core/git-for-each-repo.exe differ diff --git a/usr/lib/git-core/git-format-patch.exe b/usr/lib/git-core/git-format-patch.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-format-patch.exe and b/usr/lib/git-core/git-format-patch.exe differ diff --git a/usr/lib/git-core/git-fsck-objects.exe b/usr/lib/git-core/git-fsck-objects.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-fsck-objects.exe and b/usr/lib/git-core/git-fsck-objects.exe differ diff --git a/usr/lib/git-core/git-fsck.exe b/usr/lib/git-core/git-fsck.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-fsck.exe and b/usr/lib/git-core/git-fsck.exe differ diff --git a/usr/lib/git-core/git-fsmonitor--daemon.exe b/usr/lib/git-core/git-fsmonitor--daemon.exe index 0d17a8fd942..c799fc33164 100644 Binary files a/usr/lib/git-core/git-fsmonitor--daemon.exe and b/usr/lib/git-core/git-fsmonitor--daemon.exe differ diff --git a/usr/lib/git-core/git-gc.exe b/usr/lib/git-core/git-gc.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-gc.exe and b/usr/lib/git-core/git-gc.exe differ diff --git a/usr/lib/git-core/git-get-tar-commit-id.exe b/usr/lib/git-core/git-get-tar-commit-id.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-get-tar-commit-id.exe and b/usr/lib/git-core/git-get-tar-commit-id.exe differ diff --git a/usr/lib/git-core/git-grep.exe b/usr/lib/git-core/git-grep.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-grep.exe and b/usr/lib/git-core/git-grep.exe differ diff --git a/usr/lib/git-core/git-gui b/usr/lib/git-core/git-gui index 8e4dbf473d7..e122f648525 100755 --- a/usr/lib/git-core/git-gui +++ b/usr/lib/git-core/git-gui @@ -2318,7 +2318,7 @@ proc do_quit {{rc {1}}} { # set save [gitdir GITGUI_MSG] if {$GITGUI_BCK_exists && ![$ui_comm edit modified]} { - file rename -force [gitdir GITGUI_BCK] $save + catch { file rename -force [gitdir GITGUI_BCK] $save } set GITGUI_BCK_exists 0 } elseif {[$ui_comm edit modified]} { set msg [string trim [$ui_comm get 0.0 end]] diff --git a/usr/lib/git-core/git-hash-object.exe b/usr/lib/git-core/git-hash-object.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-hash-object.exe and b/usr/lib/git-core/git-hash-object.exe differ diff --git a/usr/lib/git-core/git-help.exe b/usr/lib/git-core/git-help.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-help.exe and b/usr/lib/git-core/git-help.exe differ diff --git a/usr/lib/git-core/git-hook.exe b/usr/lib/git-core/git-hook.exe index 0d17a8fd942..c799fc33164 100644 Binary files a/usr/lib/git-core/git-hook.exe and b/usr/lib/git-core/git-hook.exe differ diff --git a/usr/lib/git-core/git-http-backend.exe b/usr/lib/git-core/git-http-backend.exe index d452da65153..d0e39cb2400 100755 Binary files a/usr/lib/git-core/git-http-backend.exe and b/usr/lib/git-core/git-http-backend.exe differ diff --git a/usr/lib/git-core/git-http-fetch.exe b/usr/lib/git-core/git-http-fetch.exe index 3e3e1450bac..f0b7c73fda9 100755 Binary files a/usr/lib/git-core/git-http-fetch.exe and b/usr/lib/git-core/git-http-fetch.exe differ diff --git a/usr/lib/git-core/git-http-push.exe b/usr/lib/git-core/git-http-push.exe index 064c33e77eb..00d02c4b2b3 100644 Binary files a/usr/lib/git-core/git-http-push.exe and b/usr/lib/git-core/git-http-push.exe differ diff --git a/usr/lib/git-core/git-imap-send.exe b/usr/lib/git-core/git-imap-send.exe index ec6cdcb0a6d..1a9f323be10 100755 Binary files a/usr/lib/git-core/git-imap-send.exe and b/usr/lib/git-core/git-imap-send.exe differ diff --git a/usr/lib/git-core/git-index-pack.exe b/usr/lib/git-core/git-index-pack.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-index-pack.exe and b/usr/lib/git-core/git-index-pack.exe differ diff --git a/usr/lib/git-core/git-init-db.exe b/usr/lib/git-core/git-init-db.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-init-db.exe and b/usr/lib/git-core/git-init-db.exe differ diff --git a/usr/lib/git-core/git-init.exe b/usr/lib/git-core/git-init.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-init.exe and b/usr/lib/git-core/git-init.exe differ diff --git a/usr/lib/git-core/git-interpret-trailers.exe b/usr/lib/git-core/git-interpret-trailers.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-interpret-trailers.exe and b/usr/lib/git-core/git-interpret-trailers.exe differ diff --git a/usr/lib/git-core/git-log.exe b/usr/lib/git-core/git-log.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-log.exe and b/usr/lib/git-core/git-log.exe differ diff --git a/usr/lib/git-core/git-ls-files.exe b/usr/lib/git-core/git-ls-files.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-ls-files.exe and b/usr/lib/git-core/git-ls-files.exe differ diff --git a/usr/lib/git-core/git-ls-remote.exe b/usr/lib/git-core/git-ls-remote.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-ls-remote.exe and b/usr/lib/git-core/git-ls-remote.exe differ diff --git a/usr/lib/git-core/git-ls-tree.exe b/usr/lib/git-core/git-ls-tree.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-ls-tree.exe and b/usr/lib/git-core/git-ls-tree.exe differ diff --git a/usr/lib/git-core/git-mailinfo.exe b/usr/lib/git-core/git-mailinfo.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-mailinfo.exe and b/usr/lib/git-core/git-mailinfo.exe differ diff --git a/usr/lib/git-core/git-mailsplit.exe b/usr/lib/git-core/git-mailsplit.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-mailsplit.exe and b/usr/lib/git-core/git-mailsplit.exe differ diff --git a/usr/lib/git-core/git-maintenance.exe b/usr/lib/git-core/git-maintenance.exe index 0d17a8fd942..c799fc33164 100644 Binary files a/usr/lib/git-core/git-maintenance.exe and b/usr/lib/git-core/git-maintenance.exe differ diff --git a/usr/lib/git-core/git-merge-base.exe b/usr/lib/git-core/git-merge-base.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-merge-base.exe and b/usr/lib/git-core/git-merge-base.exe differ diff --git a/usr/lib/git-core/git-merge-file.exe b/usr/lib/git-core/git-merge-file.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-merge-file.exe and b/usr/lib/git-core/git-merge-file.exe differ diff --git a/usr/lib/git-core/git-merge-index.exe b/usr/lib/git-core/git-merge-index.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-merge-index.exe and b/usr/lib/git-core/git-merge-index.exe differ diff --git a/usr/lib/git-core/git-merge-ours.exe b/usr/lib/git-core/git-merge-ours.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-merge-ours.exe and b/usr/lib/git-core/git-merge-ours.exe differ diff --git a/usr/lib/git-core/git-merge-recursive.exe b/usr/lib/git-core/git-merge-recursive.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-merge-recursive.exe and b/usr/lib/git-core/git-merge-recursive.exe differ diff --git a/usr/lib/git-core/git-merge-subtree.exe b/usr/lib/git-core/git-merge-subtree.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-merge-subtree.exe and b/usr/lib/git-core/git-merge-subtree.exe differ diff --git a/usr/lib/git-core/git-merge-tree.exe b/usr/lib/git-core/git-merge-tree.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-merge-tree.exe and b/usr/lib/git-core/git-merge-tree.exe differ diff --git a/usr/lib/git-core/git-merge.exe b/usr/lib/git-core/git-merge.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-merge.exe and b/usr/lib/git-core/git-merge.exe differ diff --git a/usr/lib/git-core/git-mktag.exe b/usr/lib/git-core/git-mktag.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-mktag.exe and b/usr/lib/git-core/git-mktag.exe differ diff --git a/usr/lib/git-core/git-mktree.exe b/usr/lib/git-core/git-mktree.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-mktree.exe and b/usr/lib/git-core/git-mktree.exe differ diff --git a/usr/lib/git-core/git-multi-pack-index.exe b/usr/lib/git-core/git-multi-pack-index.exe index 0d17a8fd942..c799fc33164 100644 Binary files a/usr/lib/git-core/git-multi-pack-index.exe and b/usr/lib/git-core/git-multi-pack-index.exe differ diff --git a/usr/lib/git-core/git-mv.exe b/usr/lib/git-core/git-mv.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-mv.exe and b/usr/lib/git-core/git-mv.exe differ diff --git a/usr/lib/git-core/git-name-rev.exe b/usr/lib/git-core/git-name-rev.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-name-rev.exe and b/usr/lib/git-core/git-name-rev.exe differ diff --git a/usr/lib/git-core/git-notes.exe b/usr/lib/git-core/git-notes.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-notes.exe and b/usr/lib/git-core/git-notes.exe differ diff --git a/usr/lib/git-core/git-p4 b/usr/lib/git-core/git-p4 index 5c729ab5237..b007fb70522 100755 --- a/usr/lib/git-core/git-p4 +++ b/usr/lib/git-core/git-p4 @@ -3253,17 +3253,19 @@ class P4Sync(Command, P4UserMap): if self.stream_have_file_info: if "depotFile" in self.stream_file: f = self.stream_file["depotFile"] - # force a failure in fast-import, else an empty - # commit will be made - self.gitStream.write("\n") - self.gitStream.write("die-now\n") - self.gitStream.close() - # ignore errors, but make sure it exits first - self.importProcess.wait() - if f: - die("Error from p4 print for %s: %s" % (f, err)) - else: - die("Error from p4 print: %s" % err) + try: + # force a failure in fast-import, else an empty + # commit will be made + self.gitStream.write("\n") + self.gitStream.write("die-now\n") + self.gitStream.close() + # ignore errors, but make sure it exits first + self.importProcess.wait() + finally: + if f: + die("Error from p4 print for %s: %s" % (f, err)) + else: + die("Error from p4 print: %s" % err) if 'depotFile' in marshalled and self.stream_have_file_info: # start of a new file - output the old one first diff --git a/usr/lib/git-core/git-pack-objects.exe b/usr/lib/git-core/git-pack-objects.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-pack-objects.exe and b/usr/lib/git-core/git-pack-objects.exe differ diff --git a/usr/lib/git-core/git-pack-redundant.exe b/usr/lib/git-core/git-pack-redundant.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-pack-redundant.exe and b/usr/lib/git-core/git-pack-redundant.exe differ diff --git a/usr/lib/git-core/git-pack-refs.exe b/usr/lib/git-core/git-pack-refs.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-pack-refs.exe and b/usr/lib/git-core/git-pack-refs.exe differ diff --git a/usr/lib/git-core/git-patch-id.exe b/usr/lib/git-core/git-patch-id.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-patch-id.exe and b/usr/lib/git-core/git-patch-id.exe differ diff --git a/usr/lib/git-core/git-prune-packed.exe b/usr/lib/git-core/git-prune-packed.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-prune-packed.exe and b/usr/lib/git-core/git-prune-packed.exe differ diff --git a/usr/lib/git-core/git-prune.exe b/usr/lib/git-core/git-prune.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-prune.exe and b/usr/lib/git-core/git-prune.exe differ diff --git a/usr/lib/git-core/git-pull.exe b/usr/lib/git-core/git-pull.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-pull.exe and b/usr/lib/git-core/git-pull.exe differ diff --git a/usr/lib/git-core/git-push.exe b/usr/lib/git-core/git-push.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-push.exe and b/usr/lib/git-core/git-push.exe differ diff --git a/usr/lib/git-core/git-range-diff.exe b/usr/lib/git-core/git-range-diff.exe index 0d17a8fd942..c799fc33164 100644 Binary files a/usr/lib/git-core/git-range-diff.exe and b/usr/lib/git-core/git-range-diff.exe differ diff --git a/usr/lib/git-core/git-read-tree.exe b/usr/lib/git-core/git-read-tree.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-read-tree.exe and b/usr/lib/git-core/git-read-tree.exe differ diff --git a/usr/lib/git-core/git-rebase.exe b/usr/lib/git-core/git-rebase.exe index 0d17a8fd942..c799fc33164 100644 Binary files a/usr/lib/git-core/git-rebase.exe and b/usr/lib/git-core/git-rebase.exe differ diff --git a/usr/lib/git-core/git-receive-pack.exe b/usr/lib/git-core/git-receive-pack.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-receive-pack.exe and b/usr/lib/git-core/git-receive-pack.exe differ diff --git a/usr/lib/git-core/git-reflog.exe b/usr/lib/git-core/git-reflog.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-reflog.exe and b/usr/lib/git-core/git-reflog.exe differ diff --git a/usr/lib/git-core/git-refs.exe b/usr/lib/git-core/git-refs.exe new file mode 100644 index 00000000000..c799fc33164 Binary files /dev/null and b/usr/lib/git-core/git-refs.exe differ diff --git a/usr/lib/git-core/git-remote-ext.exe b/usr/lib/git-core/git-remote-ext.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-remote-ext.exe and b/usr/lib/git-core/git-remote-ext.exe differ diff --git a/usr/lib/git-core/git-remote-fd.exe b/usr/lib/git-core/git-remote-fd.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-remote-fd.exe and b/usr/lib/git-core/git-remote-fd.exe differ diff --git a/usr/lib/git-core/git-remote-ftp.exe b/usr/lib/git-core/git-remote-ftp.exe index 81fd6d29894..9013aa02d9c 100755 Binary files a/usr/lib/git-core/git-remote-ftp.exe and b/usr/lib/git-core/git-remote-ftp.exe differ diff --git a/usr/lib/git-core/git-remote-ftps.exe b/usr/lib/git-core/git-remote-ftps.exe index 81fd6d29894..9013aa02d9c 100755 Binary files a/usr/lib/git-core/git-remote-ftps.exe and b/usr/lib/git-core/git-remote-ftps.exe differ diff --git a/usr/lib/git-core/git-remote-http.exe b/usr/lib/git-core/git-remote-http.exe index 81fd6d29894..9013aa02d9c 100755 Binary files a/usr/lib/git-core/git-remote-http.exe and b/usr/lib/git-core/git-remote-http.exe differ diff --git a/usr/lib/git-core/git-remote-https.exe b/usr/lib/git-core/git-remote-https.exe index 81fd6d29894..9013aa02d9c 100755 Binary files a/usr/lib/git-core/git-remote-https.exe and b/usr/lib/git-core/git-remote-https.exe differ diff --git a/usr/lib/git-core/git-remote.exe b/usr/lib/git-core/git-remote.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-remote.exe and b/usr/lib/git-core/git-remote.exe differ diff --git a/usr/lib/git-core/git-repack.exe b/usr/lib/git-core/git-repack.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-repack.exe and b/usr/lib/git-core/git-repack.exe differ diff --git a/usr/lib/git-core/git-replace.exe b/usr/lib/git-core/git-replace.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-replace.exe and b/usr/lib/git-core/git-replace.exe differ diff --git a/usr/lib/git-core/git-replay.exe b/usr/lib/git-core/git-replay.exe index 0d17a8fd942..c799fc33164 100644 Binary files a/usr/lib/git-core/git-replay.exe and b/usr/lib/git-core/git-replay.exe differ diff --git a/usr/lib/git-core/git-rerere.exe b/usr/lib/git-core/git-rerere.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-rerere.exe and b/usr/lib/git-core/git-rerere.exe differ diff --git a/usr/lib/git-core/git-reset.exe b/usr/lib/git-core/git-reset.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-reset.exe and b/usr/lib/git-core/git-reset.exe differ diff --git a/usr/lib/git-core/git-restore.exe b/usr/lib/git-core/git-restore.exe index 0d17a8fd942..c799fc33164 100644 Binary files a/usr/lib/git-core/git-restore.exe and b/usr/lib/git-core/git-restore.exe differ diff --git a/usr/lib/git-core/git-rev-list.exe b/usr/lib/git-core/git-rev-list.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-rev-list.exe and b/usr/lib/git-core/git-rev-list.exe differ diff --git a/usr/lib/git-core/git-rev-parse.exe b/usr/lib/git-core/git-rev-parse.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-rev-parse.exe and b/usr/lib/git-core/git-rev-parse.exe differ diff --git a/usr/lib/git-core/git-revert.exe b/usr/lib/git-core/git-revert.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-revert.exe and b/usr/lib/git-core/git-revert.exe differ diff --git a/usr/lib/git-core/git-rm.exe b/usr/lib/git-core/git-rm.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-rm.exe and b/usr/lib/git-core/git-rm.exe differ diff --git a/usr/lib/git-core/git-send-email b/usr/lib/git-core/git-send-email index 3dc737736b0..e8371b7429c 100755 --- a/usr/lib/git-core/git-send-email +++ b/usr/lib/git-core/git-send-email @@ -1464,7 +1464,7 @@ sub gen_header { @recipients = unique_email_list(@recipients,@cc,@initial_bcc); @recipients = (map { extract_valid_address_or_die($_) } @recipients); my $date = format_2822_time($time++); - my $gitversion = '2.45.2'; + my $gitversion = '2.46.0'; if ($gitversion =~ m/..GIT_VERSION../) { $gitversion = Git::version(); } @@ -1666,9 +1666,11 @@ EOF $smtp->code =~ /250|200/ or die sprintf(__("Failed to send %s\n"), $subject).$smtp->message; } if ($quiet) { - printf($dry_run ? __("Dry-Sent %s\n") : __("Sent %s\n"), $subject); + printf($dry_run ? __("Dry-Sent %s") : __("Sent %s"), $subject); + print "\n"; } else { - print($dry_run ? __("Dry-OK. Log says:\n") : __("OK. Log says:\n")); + print($dry_run ? __("Dry-OK. Log says:") : __("OK. Log says:")); + print "\n"; if (!defined $sendmail_cmd && !file_name_is_absolute($smtp_server)) { print "Server: $smtp_server\n"; print "MAIL FROM:<$raw_from>\n"; @@ -1688,10 +1690,11 @@ EOF print $header, "\n"; if ($smtp) { print __("Result: "), $smtp->code, ' ', - ($smtp->message =~ /\n([^\n]+\n)$/s), "\n"; + ($smtp->message =~ /\n([^\n]+\n)$/s); } else { - print __("Result: OK\n"); + print __("Result: OK"); } + print "\n"; } return 1; @@ -1846,9 +1849,9 @@ sub pre_process_file { $what, $_) unless $quiet; next; } - push @cc, $c; + push @cc, $sc; printf(__("(body) Adding cc: %s from line '%s'\n"), - $c, $_) unless $quiet; + $sc, $_) unless $quiet; } } close $fh; diff --git a/usr/lib/git-core/git-send-pack.exe b/usr/lib/git-core/git-send-pack.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-send-pack.exe and b/usr/lib/git-core/git-send-pack.exe differ diff --git a/usr/lib/git-core/git-sh-i18n--envsubst.exe b/usr/lib/git-core/git-sh-i18n--envsubst.exe index 8edaff662ca..214a3345961 100755 Binary files a/usr/lib/git-core/git-sh-i18n--envsubst.exe and b/usr/lib/git-core/git-sh-i18n--envsubst.exe differ diff --git a/usr/lib/git-core/git-shell.exe b/usr/lib/git-core/git-shell.exe index b11f722eaa2..45c87c1bca3 100755 Binary files a/usr/lib/git-core/git-shell.exe and b/usr/lib/git-core/git-shell.exe differ diff --git a/usr/lib/git-core/git-shortlog.exe b/usr/lib/git-core/git-shortlog.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-shortlog.exe and b/usr/lib/git-core/git-shortlog.exe differ diff --git a/usr/lib/git-core/git-show-branch.exe b/usr/lib/git-core/git-show-branch.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-show-branch.exe and b/usr/lib/git-core/git-show-branch.exe differ diff --git a/usr/lib/git-core/git-show-index.exe b/usr/lib/git-core/git-show-index.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-show-index.exe and b/usr/lib/git-core/git-show-index.exe differ diff --git a/usr/lib/git-core/git-show-ref.exe b/usr/lib/git-core/git-show-ref.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-show-ref.exe and b/usr/lib/git-core/git-show-ref.exe differ diff --git a/usr/lib/git-core/git-show.exe b/usr/lib/git-core/git-show.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-show.exe and b/usr/lib/git-core/git-show.exe differ diff --git a/usr/lib/git-core/git-sparse-checkout.exe b/usr/lib/git-core/git-sparse-checkout.exe index 0d17a8fd942..c799fc33164 100644 Binary files a/usr/lib/git-core/git-sparse-checkout.exe and b/usr/lib/git-core/git-sparse-checkout.exe differ diff --git a/usr/lib/git-core/git-stage.exe b/usr/lib/git-core/git-stage.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-stage.exe and b/usr/lib/git-core/git-stage.exe differ diff --git a/usr/lib/git-core/git-stash.exe b/usr/lib/git-core/git-stash.exe index 0d17a8fd942..c799fc33164 100644 Binary files a/usr/lib/git-core/git-stash.exe and b/usr/lib/git-core/git-stash.exe differ diff --git a/usr/lib/git-core/git-status.exe b/usr/lib/git-core/git-status.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-status.exe and b/usr/lib/git-core/git-status.exe differ diff --git a/usr/lib/git-core/git-stripspace.exe b/usr/lib/git-core/git-stripspace.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-stripspace.exe and b/usr/lib/git-core/git-stripspace.exe differ diff --git a/usr/lib/git-core/git-submodule--helper.exe b/usr/lib/git-core/git-submodule--helper.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-submodule--helper.exe and b/usr/lib/git-core/git-submodule--helper.exe differ diff --git a/usr/lib/git-core/git-svn b/usr/lib/git-core/git-svn index bb456685f4f..0b207ed1c03 100755 --- a/usr/lib/git-core/git-svn +++ b/usr/lib/git-core/git-svn @@ -11,7 +11,7 @@ use vars qw/ $AUTHOR $VERSION $_revision $_repository $_q $_authors $_authors_prog %users/; $AUTHOR = 'Eric Wong '; -$VERSION = '2.45.2'; +$VERSION = '2.46.0'; use Carp qw/croak/; use File::Basename qw/dirname basename/; diff --git a/usr/lib/git-core/git-switch.exe b/usr/lib/git-core/git-switch.exe index 0d17a8fd942..c799fc33164 100644 Binary files a/usr/lib/git-core/git-switch.exe and b/usr/lib/git-core/git-switch.exe differ diff --git a/usr/lib/git-core/git-symbolic-ref.exe b/usr/lib/git-core/git-symbolic-ref.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-symbolic-ref.exe and b/usr/lib/git-core/git-symbolic-ref.exe differ diff --git a/usr/lib/git-core/git-tag.exe b/usr/lib/git-core/git-tag.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-tag.exe and b/usr/lib/git-core/git-tag.exe differ diff --git a/usr/lib/git-core/git-unpack-file.exe b/usr/lib/git-core/git-unpack-file.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-unpack-file.exe and b/usr/lib/git-core/git-unpack-file.exe differ diff --git a/usr/lib/git-core/git-unpack-objects.exe b/usr/lib/git-core/git-unpack-objects.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-unpack-objects.exe and b/usr/lib/git-core/git-unpack-objects.exe differ diff --git a/usr/lib/git-core/git-update-index.exe b/usr/lib/git-core/git-update-index.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-update-index.exe and b/usr/lib/git-core/git-update-index.exe differ diff --git a/usr/lib/git-core/git-update-ref.exe b/usr/lib/git-core/git-update-ref.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-update-ref.exe and b/usr/lib/git-core/git-update-ref.exe differ diff --git a/usr/lib/git-core/git-update-server-info.exe b/usr/lib/git-core/git-update-server-info.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-update-server-info.exe and b/usr/lib/git-core/git-update-server-info.exe differ diff --git a/usr/lib/git-core/git-upload-archive.exe b/usr/lib/git-core/git-upload-archive.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-upload-archive.exe and b/usr/lib/git-core/git-upload-archive.exe differ diff --git a/usr/lib/git-core/git-upload-pack.exe b/usr/lib/git-core/git-upload-pack.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-upload-pack.exe and b/usr/lib/git-core/git-upload-pack.exe differ diff --git a/usr/lib/git-core/git-var.exe b/usr/lib/git-core/git-var.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-var.exe and b/usr/lib/git-core/git-var.exe differ diff --git a/usr/lib/git-core/git-verify-commit.exe b/usr/lib/git-core/git-verify-commit.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-verify-commit.exe and b/usr/lib/git-core/git-verify-commit.exe differ diff --git a/usr/lib/git-core/git-verify-pack.exe b/usr/lib/git-core/git-verify-pack.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-verify-pack.exe and b/usr/lib/git-core/git-verify-pack.exe differ diff --git a/usr/lib/git-core/git-verify-tag.exe b/usr/lib/git-core/git-verify-tag.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-verify-tag.exe and b/usr/lib/git-core/git-verify-tag.exe differ diff --git a/usr/lib/git-core/git-version.exe b/usr/lib/git-core/git-version.exe index 0d17a8fd942..c799fc33164 100644 Binary files a/usr/lib/git-core/git-version.exe and b/usr/lib/git-core/git-version.exe differ diff --git a/usr/lib/git-core/git-whatchanged.exe b/usr/lib/git-core/git-whatchanged.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-whatchanged.exe and b/usr/lib/git-core/git-whatchanged.exe differ diff --git a/usr/lib/git-core/git-worktree.exe b/usr/lib/git-core/git-worktree.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-worktree.exe and b/usr/lib/git-core/git-worktree.exe differ diff --git a/usr/lib/git-core/git-write-tree.exe b/usr/lib/git-core/git-write-tree.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git-write-tree.exe and b/usr/lib/git-core/git-write-tree.exe differ diff --git a/usr/lib/git-core/git.exe b/usr/lib/git-core/git.exe index 0d17a8fd942..c799fc33164 100755 Binary files a/usr/lib/git-core/git.exe and b/usr/lib/git-core/git.exe differ diff --git a/usr/lib/git-core/mergetools/vimdiff b/usr/lib/git-core/mergetools/vimdiff index 97e376329bf..f8ad6b35d4d 100644 --- a/usr/lib/git-core/mergetools/vimdiff +++ b/usr/lib/git-core/mergetools/vimdiff @@ -72,7 +72,6 @@ gen_cmd_aux () { nested=0 nested_min=100 - # Step 1: # # Increase/decrease "start"/"end" indices respectively to get rid of @@ -87,7 +86,7 @@ gen_cmd_aux () { IFS=# for c in $(echo "$LAYOUT" | sed 's:.:&#:g') do - if test "$c" = " " + if test -z "$c" || test "$c" = " " then continue fi @@ -326,7 +325,7 @@ gen_cmd () { fi # If this is a single window diff with all the buffers - if ! echo "$tab" | grep ",\|/" >/dev/null + if ! echo "$tab" | grep -E ",|/" >/dev/null then CMD="$CMD | silent execute 'bufdo diffthis'" fi diff --git a/usr/lib/git-core/scalar.exe b/usr/lib/git-core/scalar.exe index d00bbf5f778..0b488d0463d 100644 Binary files a/usr/lib/git-core/scalar.exe and b/usr/lib/git-core/scalar.exe differ diff --git a/usr/share/bash-completion/completions/git b/usr/share/bash-completion/completions/git index ee7e05aed64..f509a67c3bf 100644 --- a/usr/share/bash-completion/completions/git +++ b/usr/share/bash-completion/completions/git @@ -31,15 +31,29 @@ # Note that "git" is optional --- '!f() { : commit; ...}; f' would complete # just like the 'git commit' command. # -# If you have a command that is not part of git, but you would still -# like completion, you can use __git_complete: +# To add completion for git subcommands that are implemented in external +# scripts, define a function of the form '_git_${subcommand}' while replacing +# all dashes with underscores, and the main git completion will make use of it. +# For example, to add completion for 'git do-stuff' (which could e.g. live +# in /usr/bin/git-do-stuff), name the completion function '_git_do_stuff'. +# See _git_show, _git_bisect etc. below for more examples. +# +# If you have a shell command that is not part of git (and is not called as a +# git subcommand), but you would still like git-style completion for it, use +# __git_complete. For example, to use the same completion as for 'git log' also +# for the 'gl' command: # # __git_complete gl git_log # -# Or if it's a main command (i.e. git or gitk): +# Or if the 'gk' command should be completed the same as 'gitk': # # __git_complete gk gitk # +# The second parameter of __git_complete gives the completion function; it is +# resolved as a function named "$2", or "__$2_main", or "_$2" in that order. +# In the examples above, the actual functions used for completion will be +# _git_log and __gitk_main. +# # Compatible with bash 3.2.57. # # You can set the following environment variables to influence the behavior of @@ -2975,22 +2989,42 @@ __git_complete_config_variable_name_and_value () _git_config () { - case "$prev" in - --get|--get-all|--unset|--unset-all) - __gitcomp_nl "$(__git_config_get_set_variables)" + local subcommands subcommand + + __git_resolve_builtins "config" + + subcommands="$___git_resolved_builtins" + subcommand="$(__git_find_subcommand "$subcommands")" + + if [ -z "$subcommand" ] + then + __gitcomp "$subcommands" return - ;; - *.*) - __git_complete_config_variable_value + fi + + case "$cur" in + --*) + __gitcomp_builtin "config_$subcommand" return ;; esac - case "$cur" in - --*) - __gitcomp_builtin config + + case "$subcommand" in + get) + __gitcomp_nl "$(__git_config_get_set_variables)" ;; - *) - __git_complete_config_variable_name + set) + case "$prev" in + *.*) + __git_complete_config_variable_value + ;; + *) + __git_complete_config_variable_name + ;; + esac + ;; + unset) + __gitcomp_nl "$(__git_config_get_set_variables)" ;; esac } @@ -3581,6 +3615,17 @@ _git_svn () fi } +_git_symbolic_ref () { + case "$cur" in + --*) + __gitcomp_builtin symbolic-ref + return + ;; + esac + + __git_complete_refs +} + _git_tag () { local i c="$__git_cmd_idx" f=0 diff --git a/usr/share/git-gui/lib/msgs/fr.msg b/usr/share/git-gui/lib/msgs/fr.msg index 8a9a5b5790e..e457672b58a 100644 --- a/usr/share/git-gui/lib/msgs/fr.msg +++ b/usr/share/git-gui/lib/msgs/fr.msg @@ -330,7 +330,7 @@ set ::msgcat::header "Project-Id-Version: fr\nReport-Msgid-Bugs-To: \nPO-Revisio ::msgcat::mcset fr "Unable to display %s" "Impossible d'afficher %s" ::msgcat::mcset fr "Error loading file:" "Erreur lors du chargement du fichier :" ::msgcat::mcset fr "Git Repository (subproject)" "D\u00e9p\u00f4t Git (sous projet)" -::msgcat::mcset fr "* Binary file (not showing content)." "* Fichier binaire (pas d'apper\u00e7u du contenu)." +::msgcat::mcset fr "* Binary file (not showing content)." "* Fichier binaire (pas d'aper\u00e7u du contenu)." ::msgcat::mcset fr "* Untracked file is %d bytes.\n* Showing only first %d bytes.\n" "* Le fichier non suivi fait %d octets.\n* Seuls les %d premiers octets sont montr\u00e9s.\n" ::msgcat::mcset fr "\n* Untracked file clipped here by %s.\n* To see the entire file, use an external editor.\n" "\n* Fichier suivi raccourcis ici de %s.\n* Pour voir le fichier entier, utilisez un \u00e9diteur externe.\n" ::msgcat::mcset fr "Failed to unstage selected hunk." "\u00c9chec lors de la d\u00e9sindexation de la section s\u00e9lectionn\u00e9e." diff --git a/usr/share/git-gui/lib/msgs/sv.msg b/usr/share/git-gui/lib/msgs/sv.msg index 2820e453357..dc13f6b3c68 100644 --- a/usr/share/git-gui/lib/msgs/sv.msg +++ b/usr/share/git-gui/lib/msgs/sv.msg @@ -1,11 +1,11 @@ -set ::msgcat::header "Project-Id-Version: sv\nReport-Msgid-Bugs-To: \nPO-Revision-Date: 2015-03-27 10:24+0100\nLast-Translator: Peter Krefting \nLanguage-Team: Swedish \nLanguage: sv\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=2; plural=(n != 1);\nX-Generator: Gtranslator 2.91.6\n" +set ::msgcat::header "Project-Id-Version: git-gui 0.21.0\nReport-Msgid-Bugs-To: \nPO-Revision-Date: 2023-10-26 21:23+0100\nLast-Translator: Peter Krefting \nLanguage-Team: Swedish \nLanguage: sv\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=2; plural=(n != 1);\nX-Generator: Gtranslator 3.38.0\n" ::msgcat::mcset sv "Invalid font specified in %s:" "Ogiltigt teckensnitt angivet i %s:" ::msgcat::mcset sv "Main Font" "Huvudteckensnitt" ::msgcat::mcset sv "Diff/Console Font" "Diff/konsolteckensnitt" ::msgcat::mcset sv "git-gui: fatal error" "git-gui: \u00f6desdigert fel" ::msgcat::mcset sv "Cannot find git in PATH." "Hittar inte git i PATH." ::msgcat::mcset sv "Cannot parse Git version string:" "Kan inte tolka versionsstr\u00e4ng fr\u00e5n Git:" -::msgcat::mcset sv "Git version cannot be determined.\n\n%s claims it is version '%s'.\n\n%s requires at least Git 1.5.0 or later.\n\nAssume '%s' is version 1.5.0?\n" "Kan inte avg\u00f6ra Gits version.\n\n%s s\u00e4ger att dess version \u00e4r \"%s\".\n\n%s kr\u00e4ver minst Git 1.5.0 eller senare.\n\nAnta att \"%s\" \u00e4r version 1.5.0?\n" +::msgcat::mcset sv "Git version cannot be determined.\n\n%s claims it is version '%s'.\n\n%s requires at least Git 1.5.0 or later.\n\nAssume '%s' is version 1.5.0?\n" "Kan inte avg\u00f6ra Gits version.\n\n%s s\u00e4ger att dess version \u00e4r \u201d%s\u201d.\n\n%s kr\u00e4ver minst Git 1.5.0 eller senare.\n\nAnta att \u201d%s\u201d \u00e4r version 1.5.0?\n" ::msgcat::mcset sv "Git directory not found:" "Git-katalogen hittades inte:" ::msgcat::mcset sv "Cannot move to top of working directory:" "Kan inte g\u00e5 till b\u00f6rjan p\u00e5 arbetskatalogen:" ::msgcat::mcset sv "Cannot use bare repository:" "Kan inte anv\u00e4nda naket arkiv:" @@ -31,8 +31,8 @@ set ::msgcat::header "Project-Id-Version: sv\nReport-Msgid-Bugs-To: \nPO-Revisio ::msgcat::mcset sv "Staged for removal" "K\u00f6ade f\u00f6r borttagning" ::msgcat::mcset sv "Staged for removal, still present" "K\u00f6ade f\u00f6r borttagning, fortfarande n\u00e4rvarande" ::msgcat::mcset sv "Requires merge resolution" "Kr\u00e4ver konflikthantering efter sammanslagning" -::msgcat::mcset sv "Starting gitk... please wait..." "Startar gitk... v\u00e4nta..." ::msgcat::mcset sv "Couldn't find gitk in PATH" "Hittade inte gitk i PATH." +::msgcat::mcset sv "Starting %s... please wait..." "Startar %s... v\u00e4nta..." ::msgcat::mcset sv "Couldn't find git gui in PATH" "Hittade inte git gui i PATH." ::msgcat::mcset sv "Repository" "Arkiv" ::msgcat::mcset sv "Edit" "Redigera" @@ -68,7 +68,6 @@ set ::msgcat::header "Project-Id-Version: sv\nReport-Msgid-Bugs-To: \nPO-Revisio ::msgcat::mcset sv "Reset..." "\u00c5terst\u00e4ll..." ::msgcat::mcset sv "Done" "F\u00e4rdig" ::msgcat::mcset sv "Commit@@verb" "Checka in" -::msgcat::mcset sv "New Commit" "Ny incheckning" ::msgcat::mcset sv "Amend Last Commit" "L\u00e4gg till f\u00f6reg\u00e5ende incheckning" ::msgcat::mcset sv "Rescan" "S\u00f6k p\u00e5 nytt" ::msgcat::mcset sv "Stage To Commit" "K\u00f6a f\u00f6r incheckning" @@ -89,12 +88,13 @@ set ::msgcat::header "Project-Id-Version: sv\nReport-Msgid-Bugs-To: \nPO-Revisio ::msgcat::mcset sv "About %s" "Om %s" ::msgcat::mcset sv "Online Documentation" "Webbdokumentation" ::msgcat::mcset sv "Show SSH Key" "Visa SSH-nyckel" +::msgcat::mcset sv "usage:" "anv\u00e4ndning:" ::msgcat::mcset sv "Usage" "Anv\u00e4ndning" ::msgcat::mcset sv "Error" "Fel" ::msgcat::mcset sv "fatal: cannot stat path %s: No such file or directory" "\u00f6desdigert: kunde inte ta status p\u00e5 s\u00f6kv\u00e4gen %s: Fil eller katalog saknas" ::msgcat::mcset sv "Current Branch:" "Aktuell gren:" -::msgcat::mcset sv "Staged Changes (Will Commit)" "K\u00f6ade \u00e4ndringar (kommer att checkas in)" ::msgcat::mcset sv "Unstaged Changes" "Ok\u00f6ade \u00e4ndringar" +::msgcat::mcset sv "Staged Changes (Will Commit)" "K\u00f6ade \u00e4ndringar (kommer att checkas in)" ::msgcat::mcset sv "Stage Changed" "K\u00f6a \u00e4ndrade" ::msgcat::mcset sv "Push" "S\u00e4nd" ::msgcat::mcset sv "Initial Commit Message:" "Inledande incheckningsmeddelande:" @@ -105,12 +105,16 @@ set ::msgcat::header "Project-Id-Version: sv\nReport-Msgid-Bugs-To: \nPO-Revisio ::msgcat::mcset sv "Commit Message:" "Incheckningsmeddelande:" ::msgcat::mcset sv "Copy All" "Kopiera alla" ::msgcat::mcset sv "File:" "Fil:" +::msgcat::mcset sv "Open" "\u00d6ppna" ::msgcat::mcset sv "Refresh" "Uppdatera" ::msgcat::mcset sv "Decrease Font Size" "Minska teckensnittsstorlek" ::msgcat::mcset sv "Increase Font Size" "\u00d6ka teckensnittsstorlek" ::msgcat::mcset sv "Encoding" "Teckenkodning" ::msgcat::mcset sv "Apply/Reverse Hunk" "Anv\u00e4nd/\u00e5terst\u00e4ll del" ::msgcat::mcset sv "Apply/Reverse Line" "Anv\u00e4nd/\u00e5terst\u00e4ll rad" +::msgcat::mcset sv "Revert Hunk" "\u00c5terst\u00e4ll del" +::msgcat::mcset sv "Revert Line" "\u00c5terst\u00e4ll rad" +::msgcat::mcset sv "Undo Last Revert" "\u00c5ngra senaste \u00e5terst\u00e4llning" ::msgcat::mcset sv "Run Merge Tool" "Starta verktyg f\u00f6r sammanslagning" ::msgcat::mcset sv "Use Remote Version" "Anv\u00e4nd versionen fr\u00e5n fj\u00e4rrarkivet" ::msgcat::mcset sv "Use Local Version" "Anv\u00e4nd lokala versionen" @@ -121,310 +125,14 @@ set ::msgcat::header "Project-Id-Version: sv\nReport-Msgid-Bugs-To: \nPO-Revisio ::msgcat::mcset sv "Start git gui In The Submodule" "Starta git gui i undermodulen" ::msgcat::mcset sv "Unstage Hunk From Commit" "Ta bort del ur incheckningsk\u00f6" ::msgcat::mcset sv "Unstage Lines From Commit" "Ta bort rader ur incheckningsk\u00f6" +::msgcat::mcset sv "Revert Lines" "\u00c5terst\u00e4ll rader" ::msgcat::mcset sv "Unstage Line From Commit" "Ta bort rad ur incheckningsk\u00f6" ::msgcat::mcset sv "Stage Hunk For Commit" "St\u00e4ll del i incheckningsk\u00f6" ::msgcat::mcset sv "Stage Lines For Commit" "St\u00e4ll rader i incheckningsk\u00f6" ::msgcat::mcset sv "Stage Line For Commit" "St\u00e4ll rad i incheckningsk\u00f6" ::msgcat::mcset sv "Initializing..." "Initierar..." -::msgcat::mcset sv "Possible environment issues exist.\n\nThe following environment variables are probably\ngoing to be ignored by any Git subprocess run\nby %s:\n\n" "Det finns m\u00f6jliga problem med milj\u00f6variabler.\n\nF\u00f6ljande milj\u00f6variabler kommer troligen att\nignoreras av alla Git-underprocesser som k\u00f6rs\nav %s:\n\n" -::msgcat::mcset sv "\nThis is due to a known issue with the\nTcl binary distributed by Cygwin." "\nDetta beror p\u00e5 ett k\u00e4nt problem med\nTcl-bin\u00e4ren som f\u00f6ljer med Cygwin." -::msgcat::mcset sv "\n\nA good replacement for %s\nis placing values for the user.name and\nuser.email settings into your personal\n~/.gitconfig file.\n" "\n\nDu kan ers\u00e4tta %s\nmed att l\u00e4gga in v\u00e4rden f\u00f6r inst\u00e4llningarna\nuser.name och user.email i din personliga\n~/.gitconfig-fil.\n" -::msgcat::mcset sv "Goto Line:" "G\u00e5 till rad:" -::msgcat::mcset sv "Go" "G\u00e5" -::msgcat::mcset sv "Working... please wait..." "Arbetar... v\u00e4nta..." -::msgcat::mcset sv "Close" "St\u00e4ng" -::msgcat::mcset sv "Success" "Lyckades" -::msgcat::mcset sv "Error: Command Failed" "Fel: Kommando misslyckades" -::msgcat::mcset sv "Fetching %s from %s" "H\u00e4mtar %s fr\u00e5n %s" -::msgcat::mcset sv "fatal: Cannot resolve %s" "\u00f6desdigert: Kunde inte sl\u00e5 upp %s" -::msgcat::mcset sv "Branch '%s' does not exist." "Grenen \"%s\" finns inte." -::msgcat::mcset sv "Failed to configure simplified git-pull for '%s'." "Kunde inte konfigurera f\u00f6renklad git-pull f\u00f6r '%s'." -::msgcat::mcset sv "Branch '%s' already exists." "Grenen \"%s\" finns redan." -::msgcat::mcset sv "Branch '%s' already exists.\n\nIt cannot fast-forward to %s.\nA merge is required." "Grenen \"%s\" finns redan.\n\nDen kan inte snabbspolas till %s.\nEn sammanslagning kr\u00e4vs." -::msgcat::mcset sv "Merge strategy '%s' not supported." "Sammanslagningsstrategin \"%s\" st\u00f6ds inte." -::msgcat::mcset sv "Failed to update '%s'." "Misslyckades med att uppdatera \"%s\"." -::msgcat::mcset sv "Staging area (index) is already locked." "K\u00f6omr\u00e5det (index) \u00e4r redan l\u00e5st." -::msgcat::mcset sv "Last scanned state does not match repository state.\n\nAnother Git program has modified this repository since the last scan. A rescan must be performed before the current branch can be changed.\n\nThe rescan will be automatically started now.\n" "Det senaste inl\u00e4sta tillst\u00e5ndet motsvarar inte tillst\u00e5ndet i arkivet.\n\nEtt annat Git-program har \u00e4ndrat arkivet sedan senaste avs\u00f6kningen. Du m\u00e5ste utf\u00f6ra en ny s\u00f6kning innan den aktuella grenen kan \u00e4ndras.\n\nS\u00f6kningen kommer att startas automatiskt nu.\n" -::msgcat::mcset sv "Updating working directory to '%s'..." "Uppdaterar arbetskatalogen till \"%s\"..." -::msgcat::mcset sv "files checked out" "filer utcheckade" -::msgcat::mcset sv "Aborted checkout of '%s' (file level merging is required)." "Avbryter utcheckning av \"%s\" (sammanslagning p\u00e5 filniv\u00e5 kr\u00e4vs)." -::msgcat::mcset sv "File level merge required." "Sammanslagning p\u00e5 filniv\u00e5 kr\u00e4vs." -::msgcat::mcset sv "Staying on branch '%s'." "Stannar p\u00e5 grenen \"%s\"." -::msgcat::mcset sv "You are no longer on a local branch.\n\nIf you wanted to be on a branch, create one now starting from 'This Detached Checkout'." "Du \u00e4r inte l\u00e4ngre p\u00e5 en lokal gren.\n\nOm du ville vara p\u00e5 en gren skapar du en nu, baserad p\u00e5 \"Denna fr\u00e5nkopplade utcheckning\"." -::msgcat::mcset sv "Checked out '%s'." "Checkade ut \"%s\"." -::msgcat::mcset sv "Resetting '%s' to '%s' will lose the following commits:" "Om du \u00e5terst\u00e4ller \"%s\" till \"%s\" g\u00e5r f\u00f6ljande incheckningar f\u00f6rlorade:" -::msgcat::mcset sv "Recovering lost commits may not be easy." "Det kanske inte \u00e4r s\u00e5 enkelt att \u00e5terskapa f\u00f6rlorade incheckningar." -::msgcat::mcset sv "Reset '%s'?" "\u00c5terst\u00e4lla \"%s\"?" -::msgcat::mcset sv "Visualize" "Visualisera" -::msgcat::mcset sv "Reset" "\u00c5terst\u00e4ll" -::msgcat::mcset sv "Cancel" "Avbryt" -::msgcat::mcset sv "Failed to set current branch.\n\nThis working directory is only partially switched. We successfully updated your files, but failed to update an internal Git file.\n\nThis should not have occurred. %s will now close and give up." "Kunde inte st\u00e4lla in aktuell gren.\n\nArbetskatalogen har bara v\u00e4xlats delvis. Vi uppdaterade filerna utan problem, men kunde inte uppdatera en intern fil i Git.\n\nDetta skulle inte ha h\u00e4nt. %s kommer nu st\u00e4ngas och ge upp." -::msgcat::mcset sv "fetch %s" "h\u00e4mta %s" -::msgcat::mcset sv "Fetching new changes from %s" "H\u00e4mtar nya \u00e4ndringar fr\u00e5n %s" -::msgcat::mcset sv "remote prune %s" "fj\u00e4rrborttagning %s" -::msgcat::mcset sv "Pruning tracking branches deleted from %s" "Tar bort sp\u00e5rande grenar som tagits bort fr\u00e5n %s" -::msgcat::mcset sv "fetch all remotes" "h\u00e4mta alla fj\u00e4rrarkiv" -::msgcat::mcset sv "Fetching new changes from all remotes" "H\u00e4mtar nya \u00e4ndringar fr\u00e5n alla fj\u00e4rrarkiv" -::msgcat::mcset sv "remote prune all remotes" "rensa alla fj\u00e4rrarkiv" -::msgcat::mcset sv "Pruning tracking branches deleted from all remotes" "Rensar sp\u00e5rande grenar som tagits bort, fr\u00e5n alla fj\u00e4rrarkiv" -::msgcat::mcset sv "push %s" "s\u00e4nd %s" -::msgcat::mcset sv "Pushing changes to %s" "S\u00e4nder \u00e4ndringar till %s" -::msgcat::mcset sv "Mirroring to %s" "Speglar till %s" -::msgcat::mcset sv "Pushing %s %s to %s" "S\u00e4nder %s %s till %s" -::msgcat::mcset sv "Push Branches" "S\u00e4nd grenar" -::msgcat::mcset sv "Source Branches" "K\u00e4llgrenar" -::msgcat::mcset sv "Destination Repository" "Destinationsarkiv" -::msgcat::mcset sv "Remote:" "Fj\u00e4rrarkiv:" -::msgcat::mcset sv "Arbitrary Location:" "Godtycklig plats:" -::msgcat::mcset sv "Transfer Options" "\u00d6verf\u00f6ringsalternativ" -::msgcat::mcset sv "Force overwrite existing branch (may discard changes)" "Tvinga \u00f6verskrivning av befintlig gren (kan kasta bort \u00e4ndringar)" -::msgcat::mcset sv "Use thin pack (for slow network connections)" "Anv\u00e4nd tunt paket (f\u00f6r l\u00e5ngsamma n\u00e4tverksanslutningar)" -::msgcat::mcset sv "Include tags" "Ta med taggar" -::msgcat::mcset sv "Add Remote" "L\u00e4gg till fj\u00e4rrarkiv" -::msgcat::mcset sv "Add New Remote" "L\u00e4gg till nytt fj\u00e4rrarkiv" -::msgcat::mcset sv "Add" "L\u00e4gg till" -::msgcat::mcset sv "Remote Details" "Detaljer f\u00f6r fj\u00e4rrarkiv" -::msgcat::mcset sv "Name:" "Namn:" -::msgcat::mcset sv "Location:" "Plats:" -::msgcat::mcset sv "Further Action" "Ytterligare \u00e5tg\u00e4rd" -::msgcat::mcset sv "Fetch Immediately" "H\u00e4mta omedelbart" -::msgcat::mcset sv "Initialize Remote Repository and Push" "Initiera fj\u00e4rrarkiv och s\u00e4nd till" -::msgcat::mcset sv "Do Nothing Else Now" "G\u00f6r ingent mer nu" -::msgcat::mcset sv "Please supply a remote name." "Ange ett namn f\u00f6r fj\u00e4rrarkivet." -::msgcat::mcset sv "'%s' is not an acceptable remote name." "\"%s\" kan inte anv\u00e4ndas som namn p\u00e5 fj\u00e4rrarkivet." -::msgcat::mcset sv "Failed to add remote '%s' of location '%s'." "Kunde inte l\u00e4gga till fj\u00e4rrarkivet \"%s\" p\u00e5 platsen \"%s\"." -::msgcat::mcset sv "Fetching the %s" "H\u00e4mtar %s" -::msgcat::mcset sv "Do not know how to initialize repository at location '%s'." "Vet inte hur arkivet p\u00e5 platsen \"%s\" skall initieras." -::msgcat::mcset sv "Setting up the %s (at %s)" "Konfigurerar %s (p\u00e5 %s)" -::msgcat::mcset sv "Starting..." "Startar..." -::msgcat::mcset sv "File Browser" "Filbl\u00e4ddrare" -::msgcat::mcset sv "Loading %s..." "L\u00e4ser %s..." -::msgcat::mcset sv "\[Up To Parent\]" "\[Upp till f\u00f6r\u00e4lder\]" -::msgcat::mcset sv "Browse Branch Files" "Bl\u00e4ddra filer p\u00e5 grenen" -::msgcat::mcset sv "Browse" "Bl\u00e4ddra" -::msgcat::mcset sv "Revision" "Revision" -::msgcat::mcset sv "Cannot merge while amending.\n\nYou must finish amending this commit before starting any type of merge.\n" "Kan inte sl\u00e5 ihop vid ut\u00f6kning.\n\nDu m\u00e5ste g\u00f6ra f\u00e4rdig ut\u00f6kningen av incheckningen innan du p\u00e5b\u00f6rjar n\u00e5gon slags sammanslagning.\n" -::msgcat::mcset sv "Last scanned state does not match repository state.\n\nAnother Git program has modified this repository since the last scan. A rescan must be performed before a merge can be performed.\n\nThe rescan will be automatically started now.\n" "Det senaste inl\u00e4sta tillst\u00e5ndet motsvarar inte tillst\u00e5ndet i arkivet.\n\nEtt annat Git-program har \u00e4ndrat arkivet sedan senaste avs\u00f6kningen. Du m\u00e5ste utf\u00f6ra en ny s\u00f6kning innan du kan utf\u00f6ra en sammanslagning.\n\nS\u00f6kningen kommer att startas automatiskt nu.\n" -::msgcat::mcset sv "You are in the middle of a conflicted merge.\n\nFile %s has merge conflicts.\n\nYou must resolve them, stage the file, and commit to complete the current merge. Only then can you begin another merge.\n" "Du \u00e4r mitt i en sammanslagning med konflikter.\n\nFilen %s har sammanslagningskonflikter.\n\nDu m\u00e5ste l\u00f6sa dem, k\u00f6a filen och checka in f\u00f6r att fullborda den aktuella sammanslagningen. N\u00e4r du gjort det kan du p\u00e5b\u00f6rja en ny sammanslagning.\n" -::msgcat::mcset sv "You are in the middle of a change.\n\nFile %s is modified.\n\nYou should complete the current commit before starting a merge. Doing so will help you abort a failed merge, should the need arise.\n" "Du \u00e4r mitt i en \u00e4ndring.\n\nFilen %s har \u00e4ndringar.\n\nDu b\u00f6r fullborda den aktuella incheckningen innan du p\u00e5b\u00f6rjar en sammanslagning. Om du g\u00f6r det blir det enklare att avbryta en misslyckad sammanslagning, om det skulle vara n\u00f6dv\u00e4ndigt.\n" -::msgcat::mcset sv "%s of %s" "%s av %s" -::msgcat::mcset sv "Merging %s and %s..." "Sl\u00e5r ihop %s och %s..." -::msgcat::mcset sv "Merge completed successfully." "Sammanslagningen avslutades framg\u00e5ngsrikt." -::msgcat::mcset sv "Merge failed. Conflict resolution is required." "Sammanslagningen misslyckades. Du m\u00e5ste l\u00f6sa konflikterna." -::msgcat::mcset sv "Merge Into %s" "Sl\u00e5 ihop i %s" -::msgcat::mcset sv "Revision To Merge" "Revisioner att sl\u00e5 ihop" -::msgcat::mcset sv "Cannot abort while amending.\n\nYou must finish amending this commit.\n" "Kan inte avbryta vid ut\u00f6kning.\n\nDu m\u00e5ste g\u00f6ra dig f\u00e4rdig med att ut\u00f6ka incheckningen.\n" -::msgcat::mcset sv "Abort merge?\n\nAborting the current merge will cause *ALL* uncommitted changes to be lost.\n\nContinue with aborting the current merge?" "Avbryt sammanslagning?\n\nOm du avbryter sammanslagningen kommer *ALLA* ej incheckade \u00e4ndringar att g\u00e5 f\u00f6rlorade.\n\nG\u00e5 vidare med att avbryta den aktuella sammanslagningen?" -::msgcat::mcset sv "Reset changes?\n\nResetting the changes will cause *ALL* uncommitted changes to be lost.\n\nContinue with resetting the current changes?" "\u00c5terst\u00e4ll \u00e4ndringar?\n\nOm du \u00e5terst\u00e4ller \u00e4ndringarna kommer *ALLA* ej incheckade \u00e4ndringar att g\u00e5 f\u00f6rlorade.\n\nG\u00e5 vidare med att \u00e5terst\u00e4lla de aktuella \u00e4ndringarna?" -::msgcat::mcset sv "Aborting" "Avbryter" -::msgcat::mcset sv "files reset" "filer \u00e5terst\u00e4llda" -::msgcat::mcset sv "Abort failed." "Misslyckades avbryta." -::msgcat::mcset sv "Abort completed. Ready." "Avbrytning fullbordad. Redo." -::msgcat::mcset sv "Running %s requires a selected file." "F\u00f6r att starta %s m\u00e5ste du v\u00e4lja en fil." -::msgcat::mcset sv "Are you sure you want to run %1\$s on file \"%2\$s\"?" "\u00c4r du s\u00e4ker p\u00e5 att du vill starta %1\$s med filen \"%2\$s\"?" -::msgcat::mcset sv "Are you sure you want to run %s?" "\u00c4r du s\u00e4ker p\u00e5 att du vill starta %s?" -::msgcat::mcset sv "Tool: %s" "Verktyg: %s" -::msgcat::mcset sv "Running: %s" "Exekverar: %s" -::msgcat::mcset sv "Tool completed successfully: %s" "Verktyget avslutades framg\u00e5ngsrikt: %s" -::msgcat::mcset sv "Tool failed: %s" "Verktyget misslyckades: %s" -::msgcat::mcset sv "Checkout Branch" "Checka ut gren" -::msgcat::mcset sv "Checkout" "Checka ut" -::msgcat::mcset sv "Options" "Alternativ" -::msgcat::mcset sv "Fetch Tracking Branch" "H\u00e4mta sp\u00e5rande gren" -::msgcat::mcset sv "Detach From Local Branch" "Koppla bort fr\u00e5n lokal gren" -::msgcat::mcset sv "Unsupported spell checker" "Stavningskontrollprogrammet st\u00f6ds inte" -::msgcat::mcset sv "Spell checking is unavailable" "Stavningskontroll \u00e4r ej tillg\u00e4nglig" -::msgcat::mcset sv "Invalid spell checking configuration" "Ogiltig inst\u00e4llning f\u00f6r stavningskontroll" -::msgcat::mcset sv "Reverting dictionary to %s." "\u00c5terst\u00e4ller ordlistan till %s." -::msgcat::mcset sv "Spell checker silently failed on startup" "Stavningskontroll misslyckades tyst vid start" -::msgcat::mcset sv "Unrecognized spell checker" "Stavningskontrollprogrammet k\u00e4nns inte igen" -::msgcat::mcset sv "No Suggestions" "Inga f\u00f6rslag" -::msgcat::mcset sv "Unexpected EOF from spell checker" "Ov\u00e4ntat filslut fr\u00e5n stavningskontroll" -::msgcat::mcset sv "Spell Checker Failed" "Stavningskontroll misslyckades" -::msgcat::mcset sv "%s ... %*i of %*i %s (%3i%%)" "%s... %*i av %*i %s (%3i%%)" -::msgcat::mcset sv "No differences detected.\n\n%s has no changes.\n\nThe modification date of this file was updated by another application, but the content within the file was not changed.\n\nA rescan will be automatically started to find other files which may have the same state." "Hittade inga skillnader.\n\n%s inneh\u00e5ller inga \u00e4ndringar.\n\nModifieringsdatum f\u00f6r filen uppdaterades av ett annat program, men inneh\u00e5llet i filen har inte \u00e4ndrats.\n\nEn s\u00f6kning kommer automatiskt att startas f\u00f6r att hitta andra filer som kan vara i samma tillst\u00e5nd." -::msgcat::mcset sv "Loading diff of %s..." "L\u00e4ser differens f\u00f6r %s..." -::msgcat::mcset sv "LOCAL: deleted\nREMOTE:\n" "LOKAL: borttagen\nFJ\u00c4RR:\n" -::msgcat::mcset sv "REMOTE: deleted\nLOCAL:\n" "FJ\u00c4RR: borttagen\nLOKAL:\n" -::msgcat::mcset sv "LOCAL:\n" "LOKAL:\n" -::msgcat::mcset sv "REMOTE:\n" "FJ\u00c4RR:\n" -::msgcat::mcset sv "Unable to display %s" "Kan inte visa %s" -::msgcat::mcset sv "Error loading file:" "Fel vid l\u00e4sning av fil:" -::msgcat::mcset sv "Git Repository (subproject)" "Gitarkiv (underprojekt)" -::msgcat::mcset sv "* Binary file (not showing content)." "* Bin\u00e4rfil (visar inte inneh\u00e5llet)." -::msgcat::mcset sv "* Untracked file is %d bytes.\n* Showing only first %d bytes.\n" "* Den osp\u00e5rade filen \u00e4r %d byte.\n* Visar endast inledande %d byte.\n" -::msgcat::mcset sv "\n* Untracked file clipped here by %s.\n* To see the entire file, use an external editor.\n" "\n* Den osp\u00e5rade filen klipptes h\u00e4r av %s.\n* F\u00f6r att se hela filen, anv\u00e4nd ett externt redigeringsprogram.\n" -::msgcat::mcset sv "Error loading diff:" "Fel vid inl\u00e4sning av differens:" -::msgcat::mcset sv "Failed to unstage selected hunk." "Kunde inte ta bort den valda delen fr\u00e5n k\u00f6n." -::msgcat::mcset sv "Failed to stage selected hunk." "Kunde inte l\u00e4gga till den valda delen till k\u00f6n." -::msgcat::mcset sv "Failed to unstage selected line." "Kunde inte ta bort den valda raden fr\u00e5n k\u00f6n." -::msgcat::mcset sv "Failed to stage selected line." "Kunde inte l\u00e4gga till den valda raden till k\u00f6n." -::msgcat::mcset sv "Push to" "S\u00e4nd till" -::msgcat::mcset sv "Remove Remote" "Ta bort fj\u00e4rrarkiv" -::msgcat::mcset sv "Prune from" "Ta bort fr\u00e5n" -::msgcat::mcset sv "Fetch from" "H\u00e4mta fr\u00e5n" -::msgcat::mcset sv "Select" "V\u00e4lj" -::msgcat::mcset sv "Font Family" "Teckensnittsfamilj" -::msgcat::mcset sv "Font Size" "Storlek" -::msgcat::mcset sv "Font Example" "Exempel" -::msgcat::mcset sv "This is example text.\nIf you like this text, it can be your font." "Detta \u00e4r en exempeltext.\nOm du tycker om den h\u00e4r texten kan den vara ditt teckensnitt." -::msgcat::mcset sv "Invalid global encoding '%s'" "Den globala teckenkodningen \"%s\" \u00e4r ogiltig" -::msgcat::mcset sv "Invalid repo encoding '%s'" "Arkivets teckenkodning \"%s\" \u00e4r ogiltig" -::msgcat::mcset sv "Restore Defaults" "\u00c5terst\u00e4ll standardv\u00e4rden" -::msgcat::mcset sv "Save" "Spara" -::msgcat::mcset sv "%s Repository" "Arkivet %s" -::msgcat::mcset sv "Global (All Repositories)" "Globalt (alla arkiv)" -::msgcat::mcset sv "User Name" "Anv\u00e4ndarnamn" -::msgcat::mcset sv "Email Address" "E-postadress" -::msgcat::mcset sv "Summarize Merge Commits" "Summera sammanslagningsincheckningar" -::msgcat::mcset sv "Merge Verbosity" "Pratsamhet f\u00f6r sammanslagningar" -::msgcat::mcset sv "Show Diffstat After Merge" "Visa diffstatistik efter sammanslagning" -::msgcat::mcset sv "Use Merge Tool" "Anv\u00e4nd verktyg f\u00f6r sammanslagning" -::msgcat::mcset sv "Trust File Modification Timestamps" "Lita p\u00e5 fil\u00e4ndringstidsst\u00e4mplar" -::msgcat::mcset sv "Prune Tracking Branches During Fetch" "St\u00e4da sp\u00e5rade grenar vid h\u00e4mtning" -::msgcat::mcset sv "Match Tracking Branches" "Matcha sp\u00e5rade grenar" -::msgcat::mcset sv "Use Textconv For Diffs and Blames" "Anv\u00e4nd Textconv f\u00f6r diff och klandring" -::msgcat::mcset sv "Blame Copy Only On Changed Files" "Klandra kopiering bara i \u00e4ndrade filer" -::msgcat::mcset sv "Maximum Length of Recent Repositories List" "Max l\u00e4ngd f\u00f6r lista \u00f6ver tidigare arkiv" -::msgcat::mcset sv "Minimum Letters To Blame Copy On" "Minsta antal tecken att klandra kopiering f\u00f6r" -::msgcat::mcset sv "Blame History Context Radius (days)" "Historikradie f\u00f6r klandring (dagar)" -::msgcat::mcset sv "Number of Diff Context Lines" "Antal rader sammanhang i differenser" -::msgcat::mcset sv "Additional Diff Parameters" "Ytterligare diff-parametrar" -::msgcat::mcset sv "Commit Message Text Width" "Textbredd f\u00f6r incheckningsmeddelande" -::msgcat::mcset sv "New Branch Name Template" "Mall f\u00f6r namn p\u00e5 nya grenar" -::msgcat::mcset sv "Default File Contents Encoding" "Standardteckenkodning f\u00f6r filinneh\u00e5ll" -::msgcat::mcset sv "Warn before committing to a detached head" "Varna f\u00f6r incheckning p\u00e5 fr\u00e5nkopplat huvud" -::msgcat::mcset sv "Staging of untracked files" "K\u00f6a osp\u00e5rade filer" -::msgcat::mcset sv "Show untracked files" "Visa osp\u00e5rade filer" -::msgcat::mcset sv "Tab spacing" "Blanksteg f\u00f6r tabulatortecken" -::msgcat::mcset sv "Change" "\u00c4ndra" -::msgcat::mcset sv "Spelling Dictionary:" "Stavningsordlista:" -::msgcat::mcset sv "Change Font" "Byt teckensnitt" -::msgcat::mcset sv "Choose %s" "V\u00e4lj %s" -::msgcat::mcset sv "pt." "p." -::msgcat::mcset sv "Preferences" "Inst\u00e4llningar" -::msgcat::mcset sv "Failed to completely save options:" "Misslyckades med att helt spara alternativ:" -::msgcat::mcset sv "Force resolution to the base version?" "Tvinga l\u00f6sning att anv\u00e4nda basversionen?" -::msgcat::mcset sv "Force resolution to this branch?" "Tvinga l\u00f6sning att anv\u00e4nda den aktuella grenen?" -::msgcat::mcset sv "Force resolution to the other branch?" "Tvinga l\u00f6sning att anv\u00e4nda den andra grenen?" -::msgcat::mcset sv "Note that the diff shows only conflicting changes.\n\n%s will be overwritten.\n\nThis operation can be undone only by restarting the merge." "Observera att diffen endast visar de \u00e4ndringar som st\u00e5r i konflikt.\n\n%s kommer att skrivas \u00f6ver.\n\nDu m\u00e5ste starta om sammanslagningen f\u00f6r att g\u00f6ra den h\u00e4r operationen ogjord." -::msgcat::mcset sv "File %s seems to have unresolved conflicts, still stage?" "Filen %s verkar inneh\u00e5lla ol\u00f6sta konflikter. Vill du k\u00f6a \u00e4nd\u00e5?" -::msgcat::mcset sv "Adding resolution for %s" "L\u00e4gger till l\u00f6sning f\u00f6r %s" -::msgcat::mcset sv "Cannot resolve deletion or link conflicts using a tool" "Kan inte l\u00f6sa borttagnings- eller l\u00e4nkkonflikter med ett verktyg" -::msgcat::mcset sv "Conflict file does not exist" "Konfliktfil existerar inte" -::msgcat::mcset sv "Not a GUI merge tool: '%s'" "Inte ett grafiskt verktyg f\u00f6r sammanslagning: %s" -::msgcat::mcset sv "Unsupported merge tool '%s'" "Verktyget \"%s\" f\u00f6r sammanslagning st\u00f6ds inte" -::msgcat::mcset sv "Merge tool is already running, terminate it?" "Verktyget f\u00f6r sammanslagning k\u00f6rs redan. Vill du avsluta det?" -::msgcat::mcset sv "Error retrieving versions:\n%s" "Fel vid h\u00e4mtning av versioner:\n%s" -::msgcat::mcset sv "Could not start the merge tool:\n\n%s" "Kunde inte starta verktyg f\u00f6r sammanslagning:\n\n%s" -::msgcat::mcset sv "Running merge tool..." "K\u00f6r verktyg f\u00f6r sammanslagning..." -::msgcat::mcset sv "Merge tool failed." "Verktyget f\u00f6r sammanslagning misslyckades." -::msgcat::mcset sv "Add Tool" "L\u00e4gg till verktyg" -::msgcat::mcset sv "Add New Tool Command" "L\u00e4gg till nytt verktygskommando" -::msgcat::mcset sv "Add globally" "L\u00e4gg till globalt" -::msgcat::mcset sv "Tool Details" "Detaljer f\u00f6r verktyg" -::msgcat::mcset sv "Use '/' separators to create a submenu tree:" "Anv\u00e4nd \"/\"-avdelare f\u00f6r att skapa ett undermenytr\u00e4d:" -::msgcat::mcset sv "Command:" "Kommando:" -::msgcat::mcset sv "Show a dialog before running" "Visa dialog innan programmet startas" -::msgcat::mcset sv "Ask the user to select a revision (sets \$REVISION)" "Be anv\u00e4ndaren v\u00e4lja en version (s\u00e4tter \$REVISION)" -::msgcat::mcset sv "Ask the user for additional arguments (sets \$ARGS)" "Be anv\u00e4ndaren om ytterligare parametrar (s\u00e4tter \$ARGS)" -::msgcat::mcset sv "Don't show the command output window" "Visa inte kommandots utdataf\u00f6nster" -::msgcat::mcset sv "Run only if a diff is selected (\$FILENAME not empty)" "K\u00f6r endast om en diff har markerats (\$FILENAME \u00e4r inte tomt)" -::msgcat::mcset sv "Please supply a name for the tool." "Ange ett namn f\u00f6r verktyget." -::msgcat::mcset sv "Tool '%s' already exists." "Verktyget \"%s\" finns redan." -::msgcat::mcset sv "Could not add tool:\n%s" "Kunde inte l\u00e4gga till verktyget:\n%s" -::msgcat::mcset sv "Remove Tool" "Ta bort verktyg" -::msgcat::mcset sv "Remove Tool Commands" "Ta bort verktygskommandon" -::msgcat::mcset sv "Remove" "Ta bort" -::msgcat::mcset sv "(Blue denotes repository-local tools)" "(Bl\u00e5tt anger verktyg lokala f\u00f6r arkivet)" -::msgcat::mcset sv "Run Command: %s" "K\u00f6r kommandot: %s" -::msgcat::mcset sv "Arguments" "Argument" -::msgcat::mcset sv "OK" "OK" -::msgcat::mcset sv "Find:" "S\u00f6k:" -::msgcat::mcset sv "Next" "N\u00e4sta" -::msgcat::mcset sv "Prev" "F\u00f6reg" -::msgcat::mcset sv "RegExp" "Reg.uttr." -::msgcat::mcset sv "Case" "Skiftl\u00e4ge" -::msgcat::mcset sv "Rename Branch" "Byt namn p\u00e5 gren" -::msgcat::mcset sv "Rename" "Byt namn" -::msgcat::mcset sv "Branch:" "Gren:" -::msgcat::mcset sv "New Name:" "Nytt namn:" -::msgcat::mcset sv "Please select a branch to rename." "V\u00e4lj en gren att byta namn p\u00e5." -::msgcat::mcset sv "Please supply a branch name." "Ange ett namn f\u00f6r grenen." -::msgcat::mcset sv "'%s' is not an acceptable branch name." "\"%s\" kan inte anv\u00e4ndas som namn p\u00e5 grenen." -::msgcat::mcset sv "Failed to rename '%s'." "Kunde inte byta namn p\u00e5 \"%s\"." -::msgcat::mcset sv "Delete Branch Remotely" "Ta bort gren fr\u00e5n fj\u00e4rrarkiv" -::msgcat::mcset sv "From Repository" "Fr\u00e5n arkiv" -::msgcat::mcset sv "Branches" "Grenar" -::msgcat::mcset sv "Delete Only If" "Ta endast bort om" -::msgcat::mcset sv "Merged Into:" "Sammanslagen i:" -::msgcat::mcset sv "Always (Do not perform merge checks)" "Alltid (utf\u00f6r inte sammanslagningstest)" -::msgcat::mcset sv "A branch is required for 'Merged Into'." "En gren kr\u00e4vs f\u00f6r \"Sammanslagen i\"." -::msgcat::mcset sv "The following branches are not completely merged into %s:\n\n - %s" "F\u00f6ljande grenar har inte helt slagits samman i %s:\n\n - %s" -::msgcat::mcset sv "One or more of the merge tests failed because you have not fetched the necessary commits. Try fetching from %s first." "En eller flera av sammanslagningstesterna misslyckades eftersom du inte har h\u00e4mtat de n\u00f6dv\u00e4ndiga incheckningarna. F\u00f6rs\u00f6k h\u00e4mta fr\u00e5n %s f\u00f6rst." -::msgcat::mcset sv "Please select one or more branches to delete." "V\u00e4lj en eller flera grenar att ta bort." -::msgcat::mcset sv "Recovering deleted branches is difficult.\n\nDelete the selected branches?" "Det kan vara sv\u00e5rt att \u00e5terst\u00e4lla borttagna grenar.\n\nTa bort de valda grenarna?" -::msgcat::mcset sv "Deleting branches from %s" "Tar bort grenar fr\u00e5n %s" -::msgcat::mcset sv "No repository selected." "Inget arkiv markerat." -::msgcat::mcset sv "Scanning %s..." "S\u00f6ker %s..." -::msgcat::mcset sv "Git Gui" "Git Gui" -::msgcat::mcset sv "Create New Repository" "Skapa nytt arkiv" -::msgcat::mcset sv "New..." "Nytt..." -::msgcat::mcset sv "Clone Existing Repository" "Klona befintligt arkiv" -::msgcat::mcset sv "Clone..." "Klona..." -::msgcat::mcset sv "Open Existing Repository" "\u00d6ppna befintligt arkiv" -::msgcat::mcset sv "Open..." "\u00d6ppna..." -::msgcat::mcset sv "Recent Repositories" "Senaste arkiven" -::msgcat::mcset sv "Open Recent Repository:" "\u00d6ppna tidigare arkiv:" -::msgcat::mcset sv "Failed to create repository %s:" "Kunde inte skapa arkivet %s:" -::msgcat::mcset sv "Create" "Skapa" -::msgcat::mcset sv "Directory:" "Katalog:" -::msgcat::mcset sv "Git Repository" "Gitarkiv" -::msgcat::mcset sv "Directory %s already exists." "Katalogen %s finns redan." -::msgcat::mcset sv "File %s already exists." "Filen %s finns redan." -::msgcat::mcset sv "Clone" "Klona" -::msgcat::mcset sv "Source Location:" "Plats f\u00f6r k\u00e4llkod:" -::msgcat::mcset sv "Target Directory:" "M\u00e5lkatalog:" -::msgcat::mcset sv "Clone Type:" "Typ av klon:" -::msgcat::mcset sv "Standard (Fast, Semi-Redundant, Hardlinks)" "Standard (snabb, semiredundant, h\u00e5rda l\u00e4nkar)" -::msgcat::mcset sv "Full Copy (Slower, Redundant Backup)" "Full kopia (l\u00e5ngsammare, redundant s\u00e4kerhetskopia)" -::msgcat::mcset sv "Shared (Fastest, Not Recommended, No Backup)" "Delad (snabbast, rekommenderas ej, ingen s\u00e4kerhetskopia)" -::msgcat::mcset sv "Recursively clone submodules too" "Klona \u00e4ven rekursivt undermoduler" -::msgcat::mcset sv "Not a Git repository: %s" "Inte ett Gitarkiv: %s" -::msgcat::mcset sv "Standard only available for local repository." "Standard \u00e4r endast tillg\u00e4ngligt f\u00f6r lokala arkiv." -::msgcat::mcset sv "Shared only available for local repository." "Delat \u00e4r endast tillg\u00e4ngligt f\u00f6r lokala arkiv." -::msgcat::mcset sv "Location %s already exists." "Platsen %s finns redan." -::msgcat::mcset sv "Failed to configure origin" "Kunde inte konfigurera ursprung" -::msgcat::mcset sv "Counting objects" "R\u00e4knar objekt" -::msgcat::mcset sv "buckets" "hinkar" -::msgcat::mcset sv "Unable to copy objects/info/alternates: %s" "Kunde inte kopiera objekt/info/alternativ: %s" -::msgcat::mcset sv "Nothing to clone from %s." "Ingenting att klona fr\u00e5n %s." -::msgcat::mcset sv "The 'master' branch has not been initialized." "Grenen \"master\" har inte initierats." -::msgcat::mcset sv "Hardlinks are unavailable. Falling back to copying." "H\u00e5rda l\u00e4nkar \u00e4r inte tillg\u00e4ngliga. Faller tillbaka p\u00e5 kopiering." -::msgcat::mcset sv "Cloning from %s" "Klonar fr\u00e5n %s" -::msgcat::mcset sv "Copying objects" "Kopierar objekt" -::msgcat::mcset sv "KiB" "KiB" -::msgcat::mcset sv "Unable to copy object: %s" "Kunde inte kopiera objekt: %s" -::msgcat::mcset sv "Linking objects" "L\u00e4nkar objekt" -::msgcat::mcset sv "objects" "objekt" -::msgcat::mcset sv "Unable to hardlink object: %s" "Kunde inte h\u00e5rdl\u00e4nka objekt: %s" -::msgcat::mcset sv "Cannot fetch branches and objects. See console output for details." "Kunde inte h\u00e4mta grenar och objekt. Se konsolutdata f\u00f6r detaljer." -::msgcat::mcset sv "Cannot fetch tags. See console output for details." "Kunde inte h\u00e4mta taggar. Se konsolutdata f\u00f6r detaljer." -::msgcat::mcset sv "Cannot determine HEAD. See console output for details." "Kunde inte avg\u00f6ra HEAD. Se konsolutdata f\u00f6r detaljer." -::msgcat::mcset sv "Unable to cleanup %s" "Kunde inte st\u00e4da upp %s" -::msgcat::mcset sv "Clone failed." "Kloning misslyckades." -::msgcat::mcset sv "No default branch obtained." "H\u00e4mtade ingen standardgren." -::msgcat::mcset sv "Cannot resolve %s as a commit." "Kunde inte sl\u00e5 upp %s till n\u00e5gon incheckning." -::msgcat::mcset sv "Creating working directory" "Skapar arbetskatalog" -::msgcat::mcset sv "files" "filer" -::msgcat::mcset sv "Cannot clone submodules." "Kan inte klona undermoduler." -::msgcat::mcset sv "Cloning submodules" "Klonar undermoduler" -::msgcat::mcset sv "Initial file checkout failed." "Inledande filutcheckning misslyckades." -::msgcat::mcset sv "Open" "\u00d6ppna" -::msgcat::mcset sv "Repository:" "Arkiv:" -::msgcat::mcset sv "Failed to open repository %s:" "Kunde inte \u00f6ppna arkivet %s:" ::msgcat::mcset sv "git-gui - a graphical user interface for Git." "git-gui - ett grafiskt anv\u00e4ndargr\u00e4nssnitt f\u00f6r Git." -::msgcat::mcset sv "File Viewer" "Filvisare" +::msgcat::mcset sv "%s (%s): File Viewer" "%s (%s): Filvisare" ::msgcat::mcset sv "Commit:" "Incheckning:" ::msgcat::mcset sv "Copy Commit" "Kopiera incheckning" ::msgcat::mcset sv "Find Text..." "S\u00f6k text..." @@ -447,32 +155,139 @@ set ::msgcat::header "Project-Id-Version: sv\nReport-Msgid-Bugs-To: \nPO-Revisio ::msgcat::mcset sv "Cannot find HEAD commit:" "Hittar inte incheckning f\u00f6r HEAD:" ::msgcat::mcset sv "Cannot find parent commit:" "Hittar inte f\u00f6r\u00e4ldraincheckning:" ::msgcat::mcset sv "Unable to display parent" "Kan inte visa f\u00f6r\u00e4lder" +::msgcat::mcset sv "Error loading diff:" "Fel vid inl\u00e4sning av differens:" ::msgcat::mcset sv "Originally By:" "Ursprungligen av:" ::msgcat::mcset sv "In File:" "I filen:" ::msgcat::mcset sv "Copied Or Moved Here By:" "Kopierad eller flyttad hit av:" -::msgcat::mcset sv "No keys found." "Inga nycklar hittades." -::msgcat::mcset sv "Found a public key in: %s" "Hittade \u00f6ppen nyckel i: %s" -::msgcat::mcset sv "Generate Key" "Skapa nyckel" -::msgcat::mcset sv "Copy To Clipboard" "Kopiera till Urklipp" -::msgcat::mcset sv "Your OpenSSH Public Key" "Din \u00f6ppna OpenSSH-nyckel" -::msgcat::mcset sv "Generating..." "Skapar..." -::msgcat::mcset sv "Could not start ssh-keygen:\n\n%s" "Kunde inte starta ssh-keygen:\n\n%s" -::msgcat::mcset sv "Generation failed." "Misslyckades med att skapa." -::msgcat::mcset sv "Generation succeeded, but no keys found." "Lyckades skapa nyckeln, men hittar inte n\u00e5gon nyckel." -::msgcat::mcset sv "Your key is in: %s" "Din nyckel finns i: %s" -::msgcat::mcset sv "Create Branch" "Skapa gren" +::msgcat::mcset sv "%s (%s): Checkout Branch" "%s (%s): Checka ut gren" +::msgcat::mcset sv "Checkout Branch" "Checka ut gren" +::msgcat::mcset sv "Checkout" "Checka ut" +::msgcat::mcset sv "Cancel" "Avbryt" +::msgcat::mcset sv "Revision" "Revision" +::msgcat::mcset sv "Options" "Alternativ" +::msgcat::mcset sv "Fetch Tracking Branch" "H\u00e4mta sp\u00e5rande gren" +::msgcat::mcset sv "Detach From Local Branch" "Koppla bort fr\u00e5n lokal gren" +::msgcat::mcset sv "%s (%s): Create Branch" "%s (%s): Skapa gren" ::msgcat::mcset sv "Create New Branch" "Skapa ny gren" +::msgcat::mcset sv "Create" "Skapa" ::msgcat::mcset sv "Branch Name" "Namn p\u00e5 gren" +::msgcat::mcset sv "Name:" "Namn:" ::msgcat::mcset sv "Match Tracking Branch Name" "Anv\u00e4nd namn p\u00e5 sp\u00e5rad gren" ::msgcat::mcset sv "Starting Revision" "Inledande revision" ::msgcat::mcset sv "Update Existing Branch:" "Uppdatera befintlig gren:" ::msgcat::mcset sv "No" "Nej" ::msgcat::mcset sv "Fast Forward Only" "Endast snabbspolning" +::msgcat::mcset sv "Reset" "\u00c5terst\u00e4ll" ::msgcat::mcset sv "Checkout After Creation" "Checka ut n\u00e4r skapad" ::msgcat::mcset sv "Please select a tracking branch." "V\u00e4lj en gren att sp\u00e5ra." ::msgcat::mcset sv "Tracking branch %s is not a branch in the remote repository." "Den sp\u00e5rade grenen %s \u00e4r inte en gren i fj\u00e4rrarkivet." -::msgcat::mcset sv "Cannot write shortcut:" "Kan inte skriva genv\u00e4g:" -::msgcat::mcset sv "Cannot write icon:" "Kan inte skriva ikon:" +::msgcat::mcset sv "Please supply a branch name." "Ange ett namn f\u00f6r grenen." +::msgcat::mcset sv "'%s' is not an acceptable branch name." "\u201d%s\u201d kan inte anv\u00e4ndas som namn p\u00e5 grenen." +::msgcat::mcset sv "%s (%s): Delete Branch" "%s (%s): Ta bort gren" +::msgcat::mcset sv "Delete Local Branch" "Ta bort lokal gren" +::msgcat::mcset sv "Local Branches" "Lokala grenar" +::msgcat::mcset sv "Delete Only If Merged Into" "Ta bara bort om sammanslagen med" +::msgcat::mcset sv "Always (Do not perform merge checks)" "Alltid (utf\u00f6r inte sammanslagningstest)" +::msgcat::mcset sv "The following branches are not completely merged into %s:" "F\u00f6ljande grenar \u00e4r inte till fullo sammanslagna med %s:" +::msgcat::mcset sv "Recovering deleted branches is difficult.\n\nDelete the selected branches?" "Det kan vara sv\u00e5rt att \u00e5terst\u00e4lla borttagna grenar.\n\nTa bort de valda grenarna?" +::msgcat::mcset sv " - %s:" " - %s:" +::msgcat::mcset sv "Failed to delete branches:\n%s" "Kunde inte ta bort grenar:\n%s" +::msgcat::mcset sv "%s (%s): Rename Branch" "%s (%s): Byt namn p\u00e5 gren" +::msgcat::mcset sv "Rename Branch" "Byt namn p\u00e5 gren" +::msgcat::mcset sv "Rename" "Byt namn" +::msgcat::mcset sv "Branch:" "Gren:" +::msgcat::mcset sv "New Name:" "Nytt namn:" +::msgcat::mcset sv "Please select a branch to rename." "V\u00e4lj en gren att byta namn p\u00e5." +::msgcat::mcset sv "Branch '%s' already exists." "Grenen \u201d%s\u201d finns redan." +::msgcat::mcset sv "Failed to rename '%s'." "Kunde inte byta namn p\u00e5 \u201d%s\u201d." +::msgcat::mcset sv "Starting..." "Startar..." +::msgcat::mcset sv "%s (%s): File Browser" "%s (%s): Filbl\u00e4ddrare" +::msgcat::mcset sv "Loading %s..." "L\u00e4ser %s..." +::msgcat::mcset sv "\[Up To Parent\]" "\[Upp till f\u00f6r\u00e4lder\]" +::msgcat::mcset sv "%s (%s): Browse Branch Files" "%s (%s): Bl\u00e4ddra filer p\u00e5 grenen" +::msgcat::mcset sv "Browse Branch Files" "Bl\u00e4ddra filer p\u00e5 grenen" +::msgcat::mcset sv "Browse" "Bl\u00e4ddra" +::msgcat::mcset sv "Fetching %s from %s" "H\u00e4mtar %s fr\u00e5n %s" +::msgcat::mcset sv "fatal: Cannot resolve %s" "\u00f6desdigert: Kunde inte sl\u00e5 upp %s" +::msgcat::mcset sv "Close" "St\u00e4ng" +::msgcat::mcset sv "Branch '%s' does not exist." "Grenen \u201d%s\u201d finns inte." +::msgcat::mcset sv "Failed to configure simplified git-pull for '%s'." "Kunde inte konfigurera f\u00f6renklad git-pull f\u00f6r '%s'." +::msgcat::mcset sv "Branch '%s' already exists.\n\nIt cannot fast-forward to %s.\nA merge is required." "Grenen \u201d%s\u201d finns redan.\n\nDen kan inte snabbspolas till %s.\nEn sammanslagning kr\u00e4vs." +::msgcat::mcset sv "Merge strategy '%s' not supported." "Sammanslagningsstrategin \u201d%s\u201d st\u00f6ds inte." +::msgcat::mcset sv "Failed to update '%s'." "Misslyckades med att uppdatera \u201d%s\u201d." +::msgcat::mcset sv "Staging area (index) is already locked." "K\u00f6omr\u00e5det (index) \u00e4r redan l\u00e5st." +::msgcat::mcset sv "Last scanned state does not match repository state.\n\nAnother Git program has modified this repository since the last scan. A rescan must be performed before the current branch can be changed.\n\nThe rescan will be automatically started now.\n" "Det senaste inl\u00e4sta tillst\u00e5ndet motsvarar inte tillst\u00e5ndet i arkivet.\n\nEtt annat Git-program har \u00e4ndrat arkivet sedan senaste avs\u00f6kningen. Du m\u00e5ste utf\u00f6ra en ny s\u00f6kning innan den aktuella grenen kan \u00e4ndras.\n\nS\u00f6kningen kommer att startas automatiskt nu.\n" +::msgcat::mcset sv "Updating working directory to '%s'..." "Uppdaterar arbetskatalogen till \u201d%s\u201d..." +::msgcat::mcset sv "files checked out" "filer utcheckade" +::msgcat::mcset sv "Aborted checkout of '%s' (file level merging is required)." "Avbryter utcheckning av \u201d%s\u201d (sammanslagning p\u00e5 filniv\u00e5 kr\u00e4vs)." +::msgcat::mcset sv "File level merge required." "Sammanslagning p\u00e5 filniv\u00e5 kr\u00e4vs." +::msgcat::mcset sv "Staying on branch '%s'." "Stannar p\u00e5 grenen \u201d%s\u201d." +::msgcat::mcset sv "You are no longer on a local branch.\n\nIf you wanted to be on a branch, create one now starting from 'This Detached Checkout'." "Du \u00e4r inte l\u00e4ngre p\u00e5 en lokal gren.\n\nOm du ville vara p\u00e5 en gren skapar du en nu, baserad p\u00e5 \u201dDenna fr\u00e5nkopplade utcheckning\u201d." +::msgcat::mcset sv "Checked out '%s'." "Checkade ut \u201d%s\u201d." +::msgcat::mcset sv "Resetting '%s' to '%s' will lose the following commits:" "Om du \u00e5terst\u00e4ller \u201d%s\u201d till \u201d%s\u201d g\u00e5r f\u00f6ljande incheckningar f\u00f6rlorade:" +::msgcat::mcset sv "Recovering lost commits may not be easy." "Det kanske inte \u00e4r s\u00e5 enkelt att \u00e5terskapa f\u00f6rlorade incheckningar." +::msgcat::mcset sv "Reset '%s'?" "\u00c5terst\u00e4lla \u201d%s\u201d?" +::msgcat::mcset sv "Visualize" "Visualisera" +::msgcat::mcset sv "Failed to set current branch.\n\nThis working directory is only partially switched. We successfully updated your files, but failed to update an internal Git file.\n\nThis should not have occurred. %s will now close and give up." "Kunde inte st\u00e4lla in aktuell gren.\n\nArbetskatalogen har bara v\u00e4xlats delvis. Vi uppdaterade filerna utan problem, men kunde inte uppdatera en intern fil i Git.\n\nDetta skulle inte ha h\u00e4nt. %s kommer nu st\u00e4ngas och ge upp." +::msgcat::mcset sv "Select" "V\u00e4lj" +::msgcat::mcset sv "Font Family" "Teckensnittsfamilj" +::msgcat::mcset sv "Font Size" "Storlek" +::msgcat::mcset sv "Font Example" "Exempel" +::msgcat::mcset sv "This is example text.\nIf you like this text, it can be your font." "Detta \u00e4r en exempeltext.\nOm du tycker om den h\u00e4r texten kan den vara ditt teckensnitt." +::msgcat::mcset sv "Git Gui" "Git Gui" +::msgcat::mcset sv "Create New Repository" "Skapa nytt arkiv" +::msgcat::mcset sv "New..." "Nytt..." +::msgcat::mcset sv "Clone Existing Repository" "Klona befintligt arkiv" +::msgcat::mcset sv "Clone..." "Klona..." +::msgcat::mcset sv "Open Existing Repository" "\u00d6ppna befintligt arkiv" +::msgcat::mcset sv "Open..." "\u00d6ppna..." +::msgcat::mcset sv "Recent Repositories" "Senaste arkiven" +::msgcat::mcset sv "Open Recent Repository:" "\u00d6ppna tidigare arkiv:" +::msgcat::mcset sv "Failed to create repository %s:" "Kunde inte skapa arkivet %s:" +::msgcat::mcset sv "Directory:" "Katalog:" +::msgcat::mcset sv "Git Repository" "Gitarkiv" +::msgcat::mcset sv "Directory %s already exists." "Katalogen %s finns redan." +::msgcat::mcset sv "File %s already exists." "Filen %s finns redan." +::msgcat::mcset sv "Clone" "Klona" +::msgcat::mcset sv "Source Location:" "Plats f\u00f6r k\u00e4llkod:" +::msgcat::mcset sv "Target Directory:" "M\u00e5lkatalog:" +::msgcat::mcset sv "Clone Type:" "Typ av klon:" +::msgcat::mcset sv "Standard (Fast, Semi-Redundant, Hardlinks)" "Standard (snabb, semiredundant, h\u00e5rda l\u00e4nkar)" +::msgcat::mcset sv "Full Copy (Slower, Redundant Backup)" "Full kopia (l\u00e5ngsammare, redundant s\u00e4kerhetskopia)" +::msgcat::mcset sv "Shared (Fastest, Not Recommended, No Backup)" "Delad (snabbast, rekommenderas ej, ingen s\u00e4kerhetskopia)" +::msgcat::mcset sv "Recursively clone submodules too" "Klona \u00e4ven rekursivt undermoduler" +::msgcat::mcset sv "Not a Git repository: %s" "Inte ett Gitarkiv: %s" +::msgcat::mcset sv "Standard only available for local repository." "Standard \u00e4r endast tillg\u00e4ngligt f\u00f6r lokala arkiv." +::msgcat::mcset sv "Shared only available for local repository." "Delat \u00e4r endast tillg\u00e4ngligt f\u00f6r lokala arkiv." +::msgcat::mcset sv "Location %s already exists." "Platsen %s finns redan." +::msgcat::mcset sv "Failed to configure origin" "Kunde inte konfigurera ursprung" +::msgcat::mcset sv "Counting objects" "R\u00e4knar objekt" +::msgcat::mcset sv "buckets" "hinkar" +::msgcat::mcset sv "Unable to copy objects/info/alternates: %s" "Kunde inte kopiera objekt/info/alternativ: %s" +::msgcat::mcset sv "Nothing to clone from %s." "Ingenting att klona fr\u00e5n %s." +::msgcat::mcset sv "The 'master' branch has not been initialized." "Grenen \u201dmaster\u201d har inte initierats." +::msgcat::mcset sv "Hardlinks are unavailable. Falling back to copying." "H\u00e5rda l\u00e4nkar \u00e4r inte tillg\u00e4ngliga. Faller tillbaka p\u00e5 kopiering." +::msgcat::mcset sv "Cloning from %s" "Klonar fr\u00e5n %s" +::msgcat::mcset sv "Copying objects" "Kopierar objekt" +::msgcat::mcset sv "KiB" "KiB" +::msgcat::mcset sv "Unable to copy object: %s" "Kunde inte kopiera objekt: %s" +::msgcat::mcset sv "Linking objects" "L\u00e4nkar objekt" +::msgcat::mcset sv "objects" "objekt" +::msgcat::mcset sv "Unable to hardlink object: %s" "Kunde inte h\u00e5rdl\u00e4nka objekt: %s" +::msgcat::mcset sv "Cannot fetch branches and objects. See console output for details." "Kunde inte h\u00e4mta grenar och objekt. Se konsolutdata f\u00f6r detaljer." +::msgcat::mcset sv "Cannot fetch tags. See console output for details." "Kunde inte h\u00e4mta taggar. Se konsolutdata f\u00f6r detaljer." +::msgcat::mcset sv "Cannot determine HEAD. See console output for details." "Kunde inte avg\u00f6ra HEAD. Se konsolutdata f\u00f6r detaljer." +::msgcat::mcset sv "Unable to cleanup %s" "Kunde inte st\u00e4da upp %s" +::msgcat::mcset sv "Clone failed." "Kloning misslyckades." +::msgcat::mcset sv "No default branch obtained." "H\u00e4mtade ingen standardgren." +::msgcat::mcset sv "Cannot resolve %s as a commit." "Kunde inte sl\u00e5 upp %s till n\u00e5gon incheckning." +::msgcat::mcset sv "Creating working directory" "Skapar arbetskatalog" +::msgcat::mcset sv "files" "filer" +::msgcat::mcset sv "Initial file checkout failed." "Inledande filutcheckning misslyckades." +::msgcat::mcset sv "Cloning submodules" "Klonar undermoduler" +::msgcat::mcset sv "Cannot clone submodules." "Kan inte klona undermoduler." +::msgcat::mcset sv "Repository:" "Arkiv:" +::msgcat::mcset sv "Failed to open repository %s:" "Kunde inte \u00f6ppna arkivet %s:" ::msgcat::mcset sv "This Detached Checkout" "Denna fr\u00e5nkopplade utcheckning" ::msgcat::mcset sv "Revision Expression:" "Revisionsuttryck:" ::msgcat::mcset sv "Local Branch" "Lokal gren" @@ -488,7 +303,7 @@ set ::msgcat::header "Project-Id-Version: sv\nReport-Msgid-Bugs-To: \nPO-Revisio ::msgcat::mcset sv "Error loading commit data for amend:" "Fel vid inl\u00e4sning av incheckningsdata f\u00f6r ut\u00f6kning:" ::msgcat::mcset sv "Unable to obtain your identity:" "Kunde inte h\u00e4mta din identitet:" ::msgcat::mcset sv "Invalid GIT_COMMITTER_IDENT:" "Felaktig GIT_COMMITTER_IDENT:" -::msgcat::mcset sv "warning: Tcl does not support encoding '%s'." "varning: Tcl st\u00f6der inte teckenkodningen \"%s\"." +::msgcat::mcset sv "warning: Tcl does not support encoding '%s'." "varning: Tcl st\u00f6der inte teckenkodningen \u201d%s\u201d." ::msgcat::mcset sv "Last scanned state does not match repository state.\n\nAnother Git program has modified this repository since the last scan. A rescan must be performed before another commit can be created.\n\nThe rescan will be automatically started now.\n" "Det senaste inl\u00e4sta tillst\u00e5ndet motsvarar inte tillst\u00e5ndet i arkivet.\n\nEtt annat Git-program har \u00e4ndrat arkivet sedan senaste avs\u00f6kningen. Du m\u00e5ste utf\u00f6ra en ny s\u00f6kning innan du kan g\u00f6ra en ny incheckning.\n\nS\u00f6kningen kommer att startas automatiskt nu.\n" ::msgcat::mcset sv "Unmerged files cannot be committed.\n\nFile %s has merge conflicts. You must resolve them and stage the file before committing.\n" "Osammanslagna filer kan inte checkas in.\n\nFilen %s har sammanslagningskonflikter. Du m\u00e5ste l\u00f6sa dem och k\u00f6a filen innan du checkar in den.\n" ::msgcat::mcset sv "Unknown file state %s detected.\n\nFile %s cannot be committed by this program.\n" "Ok\u00e4nd filstatus %s uppt\u00e4ckt.\n\nFilen %s kan inte checkas in av programmet.\n" @@ -508,41 +323,255 @@ set ::msgcat::header "Project-Id-Version: sv\nReport-Msgid-Bugs-To: \nPO-Revisio ::msgcat::mcset sv "commit-tree failed:" "commit-tree misslyckades:" ::msgcat::mcset sv "update-ref failed:" "update-ref misslyckades:" ::msgcat::mcset sv "Created commit %s: %s" "Skapade incheckningen %s: %s" -::msgcat::mcset sv "Delete Branch" "Ta bort gren" -::msgcat::mcset sv "Delete Local Branch" "Ta bort lokal gren" -::msgcat::mcset sv "Local Branches" "Lokala grenar" -::msgcat::mcset sv "Delete Only If Merged Into" "Ta bara bort om sammanslagen med" -::msgcat::mcset sv "The following branches are not completely merged into %s:" "F\u00f6ljande grenar \u00e4r inte till fullo sammanslagna med %s:" -::msgcat::mcset sv "Failed to delete branches:\n%s" "Kunde inte ta bort grenar:\n%s" +::msgcat::mcset sv "Working... please wait..." "Arbetar... v\u00e4nta..." +::msgcat::mcset sv "Success" "Lyckades" +::msgcat::mcset sv "Error: Command Failed" "Fel: Kommando misslyckades" +::msgcat::mcset sv "Number of loose objects" "Antal l\u00f6sa objekt" +::msgcat::mcset sv "Disk space used by loose objects" "Diskutrymme anv\u00e4nt av l\u00f6sa objekt" +::msgcat::mcset sv "Number of packed objects" "Antal packade objekt" +::msgcat::mcset sv "Number of packs" "Antal paket" +::msgcat::mcset sv "Disk space used by packed objects" "Diskutrymme anv\u00e4nt av packade objekt" +::msgcat::mcset sv "Packed objects waiting for pruning" "Packade objekt som v\u00e4ntar p\u00e5 st\u00e4dning" +::msgcat::mcset sv "Garbage files" "Skr\u00e4pfiler" +::msgcat::mcset sv "%s:" "%s:" +::msgcat::mcset sv "%s (%s): Database Statistics" "%s (%s): Databasstatistik" +::msgcat::mcset sv "Compressing the object database" "Komprimerar objektdatabasen" +::msgcat::mcset sv "Verifying the object database with fsck-objects" "Verifierar objektdatabasen med fsck-objects" +::msgcat::mcset sv "This repository currently has approximately %i loose objects.\n\nTo maintain optimal performance it is strongly recommended that you compress the database.\n\nCompress the database now?" "Arkivet har f\u00f6r n\u00e4rvarande omkring %i l\u00f6sa objekt.\n\nF\u00f6r att bibeh\u00e5lla optimal prestanda rekommenderas det \u00e5 det best\u00e4mdaste att du komprimerar databasen.\n\nKomprimera databasen nu?" +::msgcat::mcset sv "Invalid date from Git: %s" "Ogiltigt datum fr\u00e5n Git: %s" +::msgcat::mcset sv "No differences detected.\n\n%s has no changes.\n\nThe modification date of this file was updated by another application, but the content within the file was not changed.\n\nA rescan will be automatically started to find other files which may have the same state." "Hittade inga skillnader.\n\n%s inneh\u00e5ller inga \u00e4ndringar.\n\nModifieringsdatum f\u00f6r filen uppdaterades av ett annat program, men inneh\u00e5llet i filen har inte \u00e4ndrats.\n\nEn s\u00f6kning kommer automatiskt att startas f\u00f6r att hitta andra filer som kan vara i samma tillst\u00e5nd." +::msgcat::mcset sv "Loading diff of %s..." "L\u00e4ser differens f\u00f6r %s..." +::msgcat::mcset sv "LOCAL: deleted\nREMOTE:\n" "LOKAL: borttagen\nFJ\u00c4RR:\n" +::msgcat::mcset sv "REMOTE: deleted\nLOCAL:\n" "FJ\u00c4RR: borttagen\nLOKAL:\n" +::msgcat::mcset sv "LOCAL:\n" "LOKAL:\n" +::msgcat::mcset sv "REMOTE:\n" "FJ\u00c4RR:\n" +::msgcat::mcset sv "Unable to display %s" "Kan inte visa %s" +::msgcat::mcset sv "Error loading file:" "Fel vid l\u00e4sning av fil:" +::msgcat::mcset sv "Git Repository (subproject)" "Gitarkiv (underprojekt)" +::msgcat::mcset sv "* Binary file (not showing content)." "* Bin\u00e4rfil (visar inte inneh\u00e5llet)." +::msgcat::mcset sv "* Untracked file is %d bytes.\n* Showing only first %d bytes.\n" "* Den osp\u00e5rade filen \u00e4r %d byte.\n* Visar endast inledande %d byte.\n" +::msgcat::mcset sv "\n* Untracked file clipped here by %s.\n* To see the entire file, use an external editor.\n" "\n* Den osp\u00e5rade filen klipptes h\u00e4r av %s.\n* F\u00f6r att se hela filen, anv\u00e4nd ett externt redigeringsprogram.\n" +::msgcat::mcset sv "Failed to unstage selected hunk." "Kunde inte ta bort den valda delen fr\u00e5n k\u00f6n." +::msgcat::mcset sv "Failed to revert selected hunk." "Kunde inte \u00e5terst\u00e4lla den valda delen." +::msgcat::mcset sv "Failed to stage selected hunk." "Kunde inte l\u00e4gga till den valda delen till k\u00f6n." +::msgcat::mcset sv "Failed to unstage selected line." "Kunde inte ta bort den valda raden fr\u00e5n k\u00f6n." +::msgcat::mcset sv "Failed to revert selected line." "Kunde inte \u00e5terst\u00e4lla den valda raden." +::msgcat::mcset sv "Failed to stage selected line." "Kunde inte l\u00e4gga till den valda raden till k\u00f6n." +::msgcat::mcset sv "Failed to undo last revert." "Kunde inte \u00e5ngra den senaste \u00e5terst\u00e4llningen." +::msgcat::mcset sv "Default" "Standard" +::msgcat::mcset sv "System (%s)" "Systemets (%s)" +::msgcat::mcset sv "Other" "Annan" +::msgcat::mcset sv "%s: error" "%s: fel" +::msgcat::mcset sv "%s: warning" "%s: varning" +::msgcat::mcset sv "%s hook failed:" "%s-krok misslyckades:" +::msgcat::mcset sv "You must correct the above errors before committing." "Du m\u00e5ste r\u00e4tta till felen ovan innan du checkar in." +::msgcat::mcset sv "%s (%s): error" "%s (%s): fel" ::msgcat::mcset sv "Unable to unlock the index." "Kunde inte l\u00e5sa upp indexet." ::msgcat::mcset sv "Index Error" "Indexfel" ::msgcat::mcset sv "Updating the Git index failed. A rescan will be automatically started to resynchronize git-gui." "Misslyckades med att uppdatera Gitindexet. En oms\u00f6kning kommer att startas automatiskt f\u00f6r att synkronisera om git-gui." ::msgcat::mcset sv "Continue" "Forts\u00e4tt" ::msgcat::mcset sv "Unlock Index" "L\u00e5s upp index" -::msgcat::mcset sv "Unstaging %s from commit" "Tar bort %s f\u00f6r incheckningsk\u00f6n" +::msgcat::mcset sv "Unstaging selected files from commit" "Tar bort valda filer fr\u00e5n incheckningsk\u00f6n" +::msgcat::mcset sv "Unstaging %s from commit" "Tar bort %s fr\u00e5n incheckningsk\u00f6n" ::msgcat::mcset sv "Ready to commit." "Redo att checka in." +::msgcat::mcset sv "Adding selected files" "L\u00e4gger till valda filer" ::msgcat::mcset sv "Adding %s" "L\u00e4gger till %s" ::msgcat::mcset sv "Stage %d untracked files?" "K\u00f6a %d osp\u00e5rade filer?" +::msgcat::mcset sv "Adding all changed files" "L\u00e4gger till alla \u00e4ndrade filer" ::msgcat::mcset sv "Revert changes in file %s?" "\u00c5terst\u00e4ll \u00e4ndringarna i filen %s?" ::msgcat::mcset sv "Revert changes in these %i files?" "\u00c5terst\u00e4ll \u00e4ndringarna i dessa %i filer?" ::msgcat::mcset sv "Any unstaged changes will be permanently lost by the revert." "Alla ok\u00f6ade \u00e4ndringar kommer permanent g\u00e5 f\u00f6rlorade vid \u00e5terst\u00e4llningen." ::msgcat::mcset sv "Do Nothing" "G\u00f6r ingenting" +::msgcat::mcset sv "Delete untracked file %s?" "Ta bort den osp\u00e5rade filen %s?" +::msgcat::mcset sv "Delete these %i untracked files?" "Ta bort dessa %i osp\u00e5rade filer?" +::msgcat::mcset sv "Files will be permanently deleted." "Filerna kommer tas bort permanent." +::msgcat::mcset sv "Delete Files" "Ta bort filer" +::msgcat::mcset sv "Deleting" "Tar bort" +::msgcat::mcset sv "Encountered errors deleting files:\n" "Fel uppstod vid borttagning av filer:\n" +::msgcat::mcset sv "None of the %d selected files could be deleted." "Ingen av de %d valda filerna kunde tas bort." +::msgcat::mcset sv "%d of the %d selected files could not be deleted." "%d av de %d valda filerna kunde inte tas bort." ::msgcat::mcset sv "Reverting selected files" "\u00c5terst\u00e4ller valda filer" ::msgcat::mcset sv "Reverting %s" "\u00c5terst\u00e4ller %s" -::msgcat::mcset sv "Default" "Standard" -::msgcat::mcset sv "System (%s)" "Systemets (%s)" -::msgcat::mcset sv "Other" "Annan" -::msgcat::mcset sv "Invalid date from Git: %s" "Ogiltigt datum fr\u00e5n Git: %s" -::msgcat::mcset sv "Number of loose objects" "Antal l\u00f6sa objekt" -::msgcat::mcset sv "Disk space used by loose objects" "Diskutrymme anv\u00e4nt av l\u00f6sa objekt" -::msgcat::mcset sv "Number of packed objects" "Antal packade objekt" -::msgcat::mcset sv "Number of packs" "Antal paket" -::msgcat::mcset sv "Disk space used by packed objects" "Diskutrymme anv\u00e4nt av packade objekt" -::msgcat::mcset sv "Packed objects waiting for pruning" "Packade objekt som v\u00e4ntar p\u00e5 st\u00e4dning" -::msgcat::mcset sv "Garbage files" "Skr\u00e4pfiler" -::msgcat::mcset sv "Compressing the object database" "Komprimerar objektdatabasen" -::msgcat::mcset sv "Verifying the object database with fsck-objects" "Verifierar objektdatabasen med fsck-objects" -::msgcat::mcset sv "This repository currently has approximately %i loose objects.\n\nTo maintain optimal performance it is strongly recommended that you compress the database.\n\nCompress the database now?" "Arkivet har f\u00f6r n\u00e4rvarande omkring %i l\u00f6sa objekt.\n\nF\u00f6r att bibeh\u00e5lla optimal prestanda rekommenderas det \u00e5 det best\u00e4mdaste att du komprimerar databasen.\n\nKomprimera databasen nu?" -::msgcat::mcset sv "error" "fel" -::msgcat::mcset sv "warning" "varning" -::msgcat::mcset sv "You must correct the above errors before committing." "Du m\u00e5ste r\u00e4tta till felen ovan innan du checkar in." +::msgcat::mcset sv "Goto Line:" "G\u00e5 till rad:" +::msgcat::mcset sv "Go" "G\u00e5" +::msgcat::mcset sv "Cannot merge while amending.\n\nYou must finish amending this commit before starting any type of merge.\n" "Kan inte sl\u00e5 ihop vid ut\u00f6kning.\n\nDu m\u00e5ste g\u00f6ra f\u00e4rdig ut\u00f6kningen av incheckningen innan du p\u00e5b\u00f6rjar n\u00e5gon slags sammanslagning.\n" +::msgcat::mcset sv "Last scanned state does not match repository state.\n\nAnother Git program has modified this repository since the last scan. A rescan must be performed before a merge can be performed.\n\nThe rescan will be automatically started now.\n" "Det senaste inl\u00e4sta tillst\u00e5ndet motsvarar inte tillst\u00e5ndet i arkivet.\n\nEtt annat Git-program har \u00e4ndrat arkivet sedan senaste avs\u00f6kningen. Du m\u00e5ste utf\u00f6ra en ny s\u00f6kning innan du kan utf\u00f6ra en sammanslagning.\n\nS\u00f6kningen kommer att startas automatiskt nu.\n" +::msgcat::mcset sv "You are in the middle of a conflicted merge.\n\nFile %s has merge conflicts.\n\nYou must resolve them, stage the file, and commit to complete the current merge. Only then can you begin another merge.\n" "Du \u00e4r mitt i en sammanslagning med konflikter.\n\nFilen %s har sammanslagningskonflikter.\n\nDu m\u00e5ste l\u00f6sa dem, k\u00f6a filen och checka in f\u00f6r att fullborda den aktuella sammanslagningen. N\u00e4r du gjort det kan du p\u00e5b\u00f6rja en ny sammanslagning.\n" +::msgcat::mcset sv "You are in the middle of a change.\n\nFile %s is modified.\n\nYou should complete the current commit before starting a merge. Doing so will help you abort a failed merge, should the need arise.\n" "Du \u00e4r mitt i en \u00e4ndring.\n\nFilen %s har \u00e4ndringar.\n\nDu b\u00f6r fullborda den aktuella incheckningen innan du p\u00e5b\u00f6rjar en sammanslagning. Om du g\u00f6r det blir det enklare att avbryta en misslyckad sammanslagning, om det skulle vara n\u00f6dv\u00e4ndigt.\n" +::msgcat::mcset sv "%s of %s" "%s av %s" +::msgcat::mcset sv "Merging %s and %s..." "Sl\u00e5r ihop %s och %s..." +::msgcat::mcset sv "Merge completed successfully." "Sammanslagningen avslutades framg\u00e5ngsrikt." +::msgcat::mcset sv "Merge failed. Conflict resolution is required." "Sammanslagningen misslyckades. Du m\u00e5ste l\u00f6sa konflikterna." +::msgcat::mcset sv "%s (%s): Merge" "%s (%s): Sammanslagning" +::msgcat::mcset sv "Merge Into %s" "Sl\u00e5 ihop i %s" +::msgcat::mcset sv "Revision To Merge" "Revisioner att sl\u00e5 ihop" +::msgcat::mcset sv "Cannot abort while amending.\n\nYou must finish amending this commit.\n" "Kan inte avbryta vid ut\u00f6kning.\n\nDu m\u00e5ste g\u00f6ra dig f\u00e4rdig med att ut\u00f6ka incheckningen.\n" +::msgcat::mcset sv "Abort merge?\n\nAborting the current merge will cause *ALL* uncommitted changes to be lost.\n\nContinue with aborting the current merge?" "Avbryt sammanslagning?\n\nOm du avbryter sammanslagningen kommer *ALLA* ej incheckade \u00e4ndringar att g\u00e5 f\u00f6rlorade.\n\nG\u00e5 vidare med att avbryta den aktuella sammanslagningen?" +::msgcat::mcset sv "Reset changes?\n\nResetting the changes will cause *ALL* uncommitted changes to be lost.\n\nContinue with resetting the current changes?" "\u00c5terst\u00e4ll \u00e4ndringar?\n\nOm du \u00e5terst\u00e4ller \u00e4ndringarna kommer *ALLA* ej incheckade \u00e4ndringar att g\u00e5 f\u00f6rlorade.\n\nG\u00e5 vidare med att \u00e5terst\u00e4lla de aktuella \u00e4ndringarna?" +::msgcat::mcset sv "Aborting" "Avbryter" +::msgcat::mcset sv "files reset" "filer \u00e5terst\u00e4llda" +::msgcat::mcset sv "Abort failed." "Misslyckades avbryta." +::msgcat::mcset sv "Abort completed. Ready." "Avbrytning fullbordad. Redo." +::msgcat::mcset sv "Force resolution to the base version?" "Tvinga l\u00f6sning att anv\u00e4nda basversionen?" +::msgcat::mcset sv "Force resolution to this branch?" "Tvinga l\u00f6sning att anv\u00e4nda den aktuella grenen?" +::msgcat::mcset sv "Force resolution to the other branch?" "Tvinga l\u00f6sning att anv\u00e4nda den andra grenen?" +::msgcat::mcset sv "Note that the diff shows only conflicting changes.\n\n%s will be overwritten.\n\nThis operation can be undone only by restarting the merge." "Observera att diffen endast visar de \u00e4ndringar som st\u00e5r i konflikt.\n\n%s kommer att skrivas \u00f6ver.\n\nDu m\u00e5ste starta om sammanslagningen f\u00f6r att g\u00f6ra den h\u00e4r operationen ogjord." +::msgcat::mcset sv "File %s seems to have unresolved conflicts, still stage?" "Filen %s verkar inneh\u00e5lla ol\u00f6sta konflikter. Vill du k\u00f6a \u00e4nd\u00e5?" +::msgcat::mcset sv "Adding resolution for %s" "L\u00e4gger till l\u00f6sning f\u00f6r %s" +::msgcat::mcset sv "Cannot resolve deletion or link conflicts using a tool" "Kan inte l\u00f6sa borttagnings- eller l\u00e4nkkonflikter med ett verktyg" +::msgcat::mcset sv "Conflict file does not exist" "Konfliktfil existerar inte" +::msgcat::mcset sv "Not a GUI merge tool: '%s'" "Inte ett grafiskt verktyg f\u00f6r sammanslagning: %s" +::msgcat::mcset sv "Unsupported merge tool '%s'" "Verktyget \u201d%s\u201d f\u00f6r sammanslagning st\u00f6ds inte" +::msgcat::mcset sv "Merge tool is already running, terminate it?" "Verktyget f\u00f6r sammanslagning k\u00f6rs redan. Vill du avsluta det?" +::msgcat::mcset sv "Error retrieving versions:\n%s" "Fel vid h\u00e4mtning av versioner:\n%s" +::msgcat::mcset sv "Could not start the merge tool:\n\n%s" "Kunde inte starta verktyg f\u00f6r sammanslagning:\n\n%s" +::msgcat::mcset sv "Running merge tool..." "K\u00f6r verktyg f\u00f6r sammanslagning..." +::msgcat::mcset sv "Merge tool failed." "Verktyget f\u00f6r sammanslagning misslyckades." +::msgcat::mcset sv "Invalid global encoding '%s'" "Den globala teckenkodningen \u201d%s\u201d \u00e4r ogiltig" +::msgcat::mcset sv "Invalid repo encoding '%s'" "Arkivets teckenkodning \u201d%s\u201d \u00e4r ogiltig" +::msgcat::mcset sv "Restore Defaults" "\u00c5terst\u00e4ll standardv\u00e4rden" +::msgcat::mcset sv "Save" "Spara" +::msgcat::mcset sv "%s Repository" "Arkivet %s" +::msgcat::mcset sv "Global (All Repositories)" "Globalt (alla arkiv)" +::msgcat::mcset sv "User Name" "Anv\u00e4ndarnamn" +::msgcat::mcset sv "Email Address" "E-postadress" +::msgcat::mcset sv "Summarize Merge Commits" "Summera sammanslagningsincheckningar" +::msgcat::mcset sv "Merge Verbosity" "Pratsamhet f\u00f6r sammanslagningar" +::msgcat::mcset sv "Show Diffstat After Merge" "Visa diffstatistik efter sammanslagning" +::msgcat::mcset sv "Use Merge Tool" "Anv\u00e4nd verktyg f\u00f6r sammanslagning" +::msgcat::mcset sv "Trust File Modification Timestamps" "Lita p\u00e5 fil\u00e4ndringstidsst\u00e4mplar" +::msgcat::mcset sv "Prune Tracking Branches During Fetch" "St\u00e4da sp\u00e5rade grenar vid h\u00e4mtning" +::msgcat::mcset sv "Match Tracking Branches" "Matcha sp\u00e5rade grenar" +::msgcat::mcset sv "Use Textconv For Diffs and Blames" "Anv\u00e4nd Textconv f\u00f6r diff och klandring" +::msgcat::mcset sv "Blame Copy Only On Changed Files" "Klandra kopiering bara i \u00e4ndrade filer" +::msgcat::mcset sv "Maximum Length of Recent Repositories List" "Max l\u00e4ngd f\u00f6r lista \u00f6ver tidigare arkiv" +::msgcat::mcset sv "Minimum Letters To Blame Copy On" "Minsta antal tecken att klandra kopiering f\u00f6r" +::msgcat::mcset sv "Blame History Context Radius (days)" "Historikradie f\u00f6r klandring (dagar)" +::msgcat::mcset sv "Number of Diff Context Lines" "Antal rader sammanhang i differenser" +::msgcat::mcset sv "Additional Diff Parameters" "Ytterligare diff-parametrar" +::msgcat::mcset sv "Commit Message Text Width" "Textbredd f\u00f6r incheckningsmeddelande" +::msgcat::mcset sv "New Branch Name Template" "Mall f\u00f6r namn p\u00e5 nya grenar" +::msgcat::mcset sv "Default File Contents Encoding" "Standardteckenkodning f\u00f6r filinneh\u00e5ll" +::msgcat::mcset sv "Warn before committing to a detached head" "Varna f\u00f6r incheckning p\u00e5 fr\u00e5nkopplat huvud" +::msgcat::mcset sv "Staging of untracked files" "K\u00f6a osp\u00e5rade filer" +::msgcat::mcset sv "Show untracked files" "Visa osp\u00e5rade filer" +::msgcat::mcset sv "Tab spacing" "Blanksteg f\u00f6r tabulatortecken" +::msgcat::mcset sv "Change" "\u00c4ndra" +::msgcat::mcset sv "Spelling Dictionary:" "Stavningsordlista:" +::msgcat::mcset sv "Change Font" "Byt teckensnitt" +::msgcat::mcset sv "Choose %s" "V\u00e4lj %s" +::msgcat::mcset sv "pt." "p." +::msgcat::mcset sv "Preferences" "Inst\u00e4llningar" +::msgcat::mcset sv "Failed to completely save options:" "Misslyckades med att helt spara alternativ:" +::msgcat::mcset sv "%s (%s): Add Remote" "%s (%s): L\u00e4gg till fj\u00e4rrarkiv" +::msgcat::mcset sv "Add New Remote" "L\u00e4gg till nytt fj\u00e4rrarkiv" +::msgcat::mcset sv "Add" "L\u00e4gg till" +::msgcat::mcset sv "Remote Details" "Detaljer f\u00f6r fj\u00e4rrarkiv" +::msgcat::mcset sv "Location:" "Plats:" +::msgcat::mcset sv "Further Action" "Ytterligare \u00e5tg\u00e4rd" +::msgcat::mcset sv "Fetch Immediately" "H\u00e4mta omedelbart" +::msgcat::mcset sv "Initialize Remote Repository and Push" "Initiera fj\u00e4rrarkiv och s\u00e4nd till" +::msgcat::mcset sv "Do Nothing Else Now" "G\u00f6r ingent mer nu" +::msgcat::mcset sv "Please supply a remote name." "Ange ett namn f\u00f6r fj\u00e4rrarkivet." +::msgcat::mcset sv "'%s' is not an acceptable remote name." "\u201d%s\u201d kan inte anv\u00e4ndas som namn p\u00e5 fj\u00e4rrarkivet." +::msgcat::mcset sv "Failed to add remote '%s' of location '%s'." "Kunde inte l\u00e4gga till fj\u00e4rrarkivet \u201d%s\u201d p\u00e5 platsen \u201d%s\u201d." +::msgcat::mcset sv "fetch %s" "h\u00e4mta %s" +::msgcat::mcset sv "Fetching the %s" "H\u00e4mtar %s" +::msgcat::mcset sv "Do not know how to initialize repository at location '%s'." "Vet inte hur arkivet p\u00e5 platsen \u201d%s\u201d skall initieras." +::msgcat::mcset sv "push %s" "s\u00e4nd %s" +::msgcat::mcset sv "Setting up the %s (at %s)" "Konfigurerar %s (p\u00e5 %s)" +::msgcat::mcset sv "%s (%s): Delete Branch Remotely" "%s (%s): Ta bort gren fr\u00e5n fj\u00e4rrarkiv" +::msgcat::mcset sv "Delete Branch Remotely" "Ta bort gren fr\u00e5n fj\u00e4rrarkiv" +::msgcat::mcset sv "From Repository" "Fr\u00e5n arkiv" +::msgcat::mcset sv "Remote:" "Fj\u00e4rrarkiv:" +::msgcat::mcset sv "Arbitrary Location:" "Godtycklig plats:" +::msgcat::mcset sv "Branches" "Grenar" +::msgcat::mcset sv "Delete Only If" "Ta endast bort om" +::msgcat::mcset sv "Merged Into:" "Sammanslagen i:" +::msgcat::mcset sv "A branch is required for 'Merged Into'." "En gren kr\u00e4vs f\u00f6r \u201dSammanslagen i\u201d." +::msgcat::mcset sv "The following branches are not completely merged into %s:\n\n - %s" "F\u00f6ljande grenar har inte helt slagits samman i %s:\n\n - %s" +::msgcat::mcset sv "One or more of the merge tests failed because you have not fetched the necessary commits. Try fetching from %s first." "En eller flera av sammanslagningstesterna misslyckades eftersom du inte har h\u00e4mtat de n\u00f6dv\u00e4ndiga incheckningarna. F\u00f6rs\u00f6k h\u00e4mta fr\u00e5n %s f\u00f6rst." +::msgcat::mcset sv "Please select one or more branches to delete." "V\u00e4lj en eller flera grenar att ta bort." +::msgcat::mcset sv "Deleting branches from %s" "Tar bort grenar fr\u00e5n %s" +::msgcat::mcset sv "No repository selected." "Inget arkiv markerat." +::msgcat::mcset sv "Scanning %s..." "S\u00f6ker %s..." +::msgcat::mcset sv "Push to" "S\u00e4nd till" +::msgcat::mcset sv "Remove Remote" "Ta bort fj\u00e4rrarkiv" +::msgcat::mcset sv "Prune from" "Ta bort fr\u00e5n" +::msgcat::mcset sv "Fetch from" "H\u00e4mta fr\u00e5n" +::msgcat::mcset sv "All" "Alla" +::msgcat::mcset sv "Find:" "S\u00f6k:" +::msgcat::mcset sv "Next" "N\u00e4sta" +::msgcat::mcset sv "Prev" "F\u00f6reg" +::msgcat::mcset sv "RegExp" "Reg.uttr." +::msgcat::mcset sv "Case" "Skiftl\u00e4ge" +::msgcat::mcset sv "%s (%s): Create Desktop Icon" "%s (%s): Skapa skrivbordsikon" +::msgcat::mcset sv "Cannot write shortcut:" "Kan inte skriva genv\u00e4g:" +::msgcat::mcset sv "Cannot write icon:" "Kan inte skriva ikon:" +::msgcat::mcset sv "Unsupported spell checker" "Stavningskontrollprogrammet st\u00f6ds inte" +::msgcat::mcset sv "Spell checking is unavailable" "Stavningskontroll \u00e4r ej tillg\u00e4nglig" +::msgcat::mcset sv "Invalid spell checking configuration" "Ogiltig inst\u00e4llning f\u00f6r stavningskontroll" +::msgcat::mcset sv "Reverting dictionary to %s." "\u00c5terst\u00e4ller ordlistan till %s." +::msgcat::mcset sv "Spell checker silently failed on startup" "Stavningskontroll misslyckades tyst vid start" +::msgcat::mcset sv "Unrecognized spell checker" "Stavningskontrollprogrammet k\u00e4nns inte igen" +::msgcat::mcset sv "No Suggestions" "Inga f\u00f6rslag" +::msgcat::mcset sv "Unexpected EOF from spell checker" "Ov\u00e4ntat filslut fr\u00e5n stavningskontroll" +::msgcat::mcset sv "Spell Checker Failed" "Stavningskontroll misslyckades" +::msgcat::mcset sv "No keys found." "Inga nycklar hittades." +::msgcat::mcset sv "Found a public key in: %s" "Hittade \u00f6ppen nyckel i: %s" +::msgcat::mcset sv "Generate Key" "Skapa nyckel" +::msgcat::mcset sv "Copy To Clipboard" "Kopiera till Urklipp" +::msgcat::mcset sv "Your OpenSSH Public Key" "Din \u00f6ppna OpenSSH-nyckel" +::msgcat::mcset sv "Generating..." "Skapar..." +::msgcat::mcset sv "Could not start ssh-keygen:\n\n%s" "Kunde inte starta ssh-keygen:\n\n%s" +::msgcat::mcset sv "Generation failed." "Misslyckades med att skapa." +::msgcat::mcset sv "Generation succeeded, but no keys found." "Lyckades skapa nyckeln, men hittar inte n\u00e5gon nyckel." +::msgcat::mcset sv "Your key is in: %s" "Din nyckel finns i: %s" +::msgcat::mcset sv "%s ... %*i of %*i %s (%3i%%)" "%s... %*i av %*i %s (%3i%%)" +::msgcat::mcset sv "%s (%s): Add Tool" "%s (%s): L\u00e4gg till verktyg" +::msgcat::mcset sv "Add New Tool Command" "L\u00e4gg till nytt verktygskommando" +::msgcat::mcset sv "Add globally" "L\u00e4gg till globalt" +::msgcat::mcset sv "Tool Details" "Detaljer f\u00f6r verktyg" +::msgcat::mcset sv "Use '/' separators to create a submenu tree:" "Anv\u00e4nd \u201d/\u201d-avdelare f\u00f6r att skapa ett undermenytr\u00e4d:" +::msgcat::mcset sv "Command:" "Kommando:" +::msgcat::mcset sv "Show a dialog before running" "Visa dialog innan programmet startas" +::msgcat::mcset sv "Ask the user to select a revision (sets \$REVISION)" "Be anv\u00e4ndaren v\u00e4lja en version (s\u00e4tter \$REVISION)" +::msgcat::mcset sv "Ask the user for additional arguments (sets \$ARGS)" "Be anv\u00e4ndaren om ytterligare parametrar (s\u00e4tter \$ARGS)" +::msgcat::mcset sv "Don't show the command output window" "Visa inte kommandots utdataf\u00f6nster" +::msgcat::mcset sv "Run only if a diff is selected (\$FILENAME not empty)" "K\u00f6r endast om en diff har markerats (\$FILENAME \u00e4r inte tomt)" +::msgcat::mcset sv "Please supply a name for the tool." "Ange ett namn f\u00f6r verktyget." +::msgcat::mcset sv "Tool '%s' already exists." "Verktyget \u201d%s\u201d finns redan." +::msgcat::mcset sv "Could not add tool:\n%s" "Kunde inte l\u00e4gga till verktyget:\n%s" +::msgcat::mcset sv "%s (%s): Remove Tool" "%s (%s): Ta bort verktyg" +::msgcat::mcset sv "Remove Tool Commands" "Ta bort verktygskommandon" +::msgcat::mcset sv "Remove" "Ta bort" +::msgcat::mcset sv "(Blue denotes repository-local tools)" "(Bl\u00e5tt anger verktyg lokala f\u00f6r arkivet)" +::msgcat::mcset sv "%s (%s):" "%s (%s):" +::msgcat::mcset sv "Run Command: %s" "K\u00f6r kommandot: %s" +::msgcat::mcset sv "Arguments" "Argument" +::msgcat::mcset sv "OK" "OK" +::msgcat::mcset sv "Running %s requires a selected file." "F\u00f6r att starta %s m\u00e5ste du v\u00e4lja en fil." +::msgcat::mcset sv "Are you sure you want to run %1\$s on file \"%2\$s\"?" "\u00c4r du s\u00e4ker p\u00e5 att du vill starta %1\$s med filen \u201d%2\$s\u201d?" +::msgcat::mcset sv "Are you sure you want to run %s?" "\u00c4r du s\u00e4ker p\u00e5 att du vill starta %s?" +::msgcat::mcset sv "Tool: %s" "Verktyg: %s" +::msgcat::mcset sv "Running: %s" "Exekverar: %s" +::msgcat::mcset sv "Tool completed successfully: %s" "Verktyget avslutades framg\u00e5ngsrikt: %s" +::msgcat::mcset sv "Tool failed: %s" "Verktyget misslyckades: %s" +::msgcat::mcset sv "Fetching new changes from %s" "H\u00e4mtar nya \u00e4ndringar fr\u00e5n %s" +::msgcat::mcset sv "remote prune %s" "fj\u00e4rrborttagning %s" +::msgcat::mcset sv "Pruning tracking branches deleted from %s" "Tar bort sp\u00e5rande grenar som tagits bort fr\u00e5n %s" +::msgcat::mcset sv "fetch all remotes" "h\u00e4mta alla fj\u00e4rrarkiv" +::msgcat::mcset sv "Fetching new changes from all remotes" "H\u00e4mtar nya \u00e4ndringar fr\u00e5n alla fj\u00e4rrarkiv" +::msgcat::mcset sv "remote prune all remotes" "rensa alla fj\u00e4rrarkiv" +::msgcat::mcset sv "Pruning tracking branches deleted from all remotes" "Rensar sp\u00e5rande grenar som tagits bort, fr\u00e5n alla fj\u00e4rrarkiv" +::msgcat::mcset sv "Pushing changes to %s" "S\u00e4nder \u00e4ndringar till %s" +::msgcat::mcset sv "Mirroring to %s" "Speglar till %s" +::msgcat::mcset sv "Pushing %s %s to %s" "S\u00e4nder %s %s till %s" +::msgcat::mcset sv "Push Branches" "S\u00e4nd grenar" +::msgcat::mcset sv "Source Branches" "K\u00e4llgrenar" +::msgcat::mcset sv "Destination Repository" "Destinationsarkiv" +::msgcat::mcset sv "Transfer Options" "\u00d6verf\u00f6ringsalternativ" +::msgcat::mcset sv "Force overwrite existing branch (may discard changes)" "Tvinga \u00f6verskrivning av befintlig gren (kan kasta bort \u00e4ndringar)" +::msgcat::mcset sv "Use thin pack (for slow network connections)" "Anv\u00e4nd tunt paket (f\u00f6r l\u00e5ngsamma n\u00e4tverksanslutningar)" +::msgcat::mcset sv "Include tags" "Ta med taggar" +::msgcat::mcset sv "%s (%s): Push" "%s (%s): S\u00e4nd" diff --git a/usr/share/git/buildsystems/CMakeLists.txt b/usr/share/git/buildsystems/CMakeLists.txt index 804629c525b..832f46b316b 100644 --- a/usr/share/git/buildsystems/CMakeLists.txt +++ b/usr/share/git/buildsystems/CMakeLists.txt @@ -976,11 +976,12 @@ list(TRANSFORM test-reftable_SOURCES PREPEND "${CMAKE_SOURCE_DIR}/") #unit-tests add_library(unit-test-lib OBJECT ${CMAKE_SOURCE_DIR}/t/unit-tests/test-lib.c) +add_library(unit-test-lib-oid OBJECT ${CMAKE_SOURCE_DIR}/t/unit-tests/lib-oid.c) parse_makefile_for_scripts(unit_test_PROGRAMS "UNIT_TEST_PROGRAMS" "") foreach(unit_test ${unit_test_PROGRAMS}) add_executable("${unit_test}" "${CMAKE_SOURCE_DIR}/t/unit-tests/${unit_test}.c") - target_link_libraries("${unit_test}" unit-test-lib common-main) + target_link_libraries("${unit_test}" unit-test-lib unit-test-lib-oid common-main) set_target_properties("${unit_test}" PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/t/unit-tests/bin) if(MSVC) @@ -1005,10 +1006,11 @@ endforeach() #test-tool parse_makefile_for_sources(test-tool_SOURCES "TEST_BUILTINS_OBJS") +add_library(test-lib OBJECT ${CMAKE_SOURCE_DIR}/t/unit-tests/test-lib.c) list(TRANSFORM test-tool_SOURCES PREPEND "${CMAKE_SOURCE_DIR}/t/helper/") add_executable(test-tool ${CMAKE_SOURCE_DIR}/t/helper/test-tool.c ${test-tool_SOURCES} ${test-reftable_SOURCES}) -target_link_libraries(test-tool common-main) +target_link_libraries(test-tool test-lib common-main) set_target_properties(test-fake-ssh test-tool PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/t/helper) diff --git a/usr/share/git/coccinelle/refs.cocci b/usr/share/git/coccinelle/refs.cocci new file mode 100644 index 00000000000..31d9cad8f38 --- /dev/null +++ b/usr/share/git/coccinelle/refs.cocci @@ -0,0 +1,103 @@ +// Migrate "refs.h" to not rely on `the_repository` implicitly anymore. +@@ +@@ +( +- resolve_ref_unsafe ++ refs_resolve_ref_unsafe +| +- resolve_refdup ++ refs_resolve_refdup +| +- read_ref_full ++ refs_read_ref_full +| +- read_ref ++ refs_read_ref +| +- ref_exists ++ refs_ref_exists +| +- head_ref ++ refs_head_ref +| +- for_each_ref ++ refs_for_each_ref +| +- for_each_ref_in ++ refs_for_each_ref_in +| +- for_each_fullref_in ++ refs_for_each_fullref_in +| +- for_each_tag_ref ++ refs_for_each_tag_ref +| +- for_each_branch_ref ++ refs_for_each_branch_ref +| +- for_each_remote_ref ++ refs_for_each_remote_ref +| +- for_each_glob_ref ++ refs_for_each_glob_ref +| +- for_each_glob_ref_in ++ refs_for_each_glob_ref_in +| +- head_ref_namespaced ++ refs_head_ref_namespaced +| +- for_each_namespaced_ref ++ refs_for_each_namespaced_ref +| +- for_each_rawref ++ refs_for_each_rawref +| +- safe_create_reflog ++ refs_create_reflog +| +- reflog_exists ++ refs_reflog_exists +| +- delete_ref ++ refs_delete_ref +| +- delete_refs ++ refs_delete_refs +| +- delete_reflog ++ refs_delete_reflog +| +- for_each_reflog_ent ++ refs_for_each_reflog_ent +| +- for_each_reflog_ent_reverse ++ refs_for_each_reflog_ent_reverse +| +- for_each_reflog ++ refs_for_each_reflog +| +- shorten_unambiguous_ref ++ refs_shorten_unambiguous_ref +| +- rename_ref ++ refs_rename_ref +| +- copy_existing_ref ++ refs_copy_existing_ref +| +- create_symref ++ refs_create_symref +| +- ref_transaction_begin ++ ref_store_transaction_begin +| +- update_ref ++ refs_update_ref +| +- reflog_expire ++ refs_reflog_expire +) + ( ++ get_main_ref_store(the_repository), + ...) diff --git a/usr/share/git/completion/git-completion.bash b/usr/share/git/completion/git-completion.bash index ee7e05aed64..f509a67c3bf 100644 --- a/usr/share/git/completion/git-completion.bash +++ b/usr/share/git/completion/git-completion.bash @@ -31,15 +31,29 @@ # Note that "git" is optional --- '!f() { : commit; ...}; f' would complete # just like the 'git commit' command. # -# If you have a command that is not part of git, but you would still -# like completion, you can use __git_complete: +# To add completion for git subcommands that are implemented in external +# scripts, define a function of the form '_git_${subcommand}' while replacing +# all dashes with underscores, and the main git completion will make use of it. +# For example, to add completion for 'git do-stuff' (which could e.g. live +# in /usr/bin/git-do-stuff), name the completion function '_git_do_stuff'. +# See _git_show, _git_bisect etc. below for more examples. +# +# If you have a shell command that is not part of git (and is not called as a +# git subcommand), but you would still like git-style completion for it, use +# __git_complete. For example, to use the same completion as for 'git log' also +# for the 'gl' command: # # __git_complete gl git_log # -# Or if it's a main command (i.e. git or gitk): +# Or if the 'gk' command should be completed the same as 'gitk': # # __git_complete gk gitk # +# The second parameter of __git_complete gives the completion function; it is +# resolved as a function named "$2", or "__$2_main", or "_$2" in that order. +# In the examples above, the actual functions used for completion will be +# _git_log and __gitk_main. +# # Compatible with bash 3.2.57. # # You can set the following environment variables to influence the behavior of @@ -2975,22 +2989,42 @@ __git_complete_config_variable_name_and_value () _git_config () { - case "$prev" in - --get|--get-all|--unset|--unset-all) - __gitcomp_nl "$(__git_config_get_set_variables)" + local subcommands subcommand + + __git_resolve_builtins "config" + + subcommands="$___git_resolved_builtins" + subcommand="$(__git_find_subcommand "$subcommands")" + + if [ -z "$subcommand" ] + then + __gitcomp "$subcommands" return - ;; - *.*) - __git_complete_config_variable_value + fi + + case "$cur" in + --*) + __gitcomp_builtin "config_$subcommand" return ;; esac - case "$cur" in - --*) - __gitcomp_builtin config + + case "$subcommand" in + get) + __gitcomp_nl "$(__git_config_get_set_variables)" ;; - *) - __git_complete_config_variable_name + set) + case "$prev" in + *.*) + __git_complete_config_variable_value + ;; + *) + __git_complete_config_variable_name + ;; + esac + ;; + unset) + __gitcomp_nl "$(__git_config_get_set_variables)" ;; esac } @@ -3581,6 +3615,17 @@ _git_svn () fi } +_git_symbolic_ref () { + case "$cur" in + --*) + __gitcomp_builtin symbolic-ref + return + ;; + esac + + __git_complete_refs +} + _git_tag () { local i c="$__git_cmd_idx" f=0 diff --git a/usr/share/git/completion/git-completion.zsh b/usr/share/git/completion/git-completion.zsh index cac6f618817..f5877bd7a1e 100644 --- a/usr/share/git/completion/git-completion.zsh +++ b/usr/share/git/completion/git-completion.zsh @@ -272,6 +272,7 @@ _git () { local _ret=1 local cur cword prev + local __git_repo_path cur=${words[CURRENT]} prev=${words[CURRENT-1]} diff --git a/usr/share/git/credential/osxkeychain/git-credential-osxkeychain.c b/usr/share/git/credential/osxkeychain/git-credential-osxkeychain.c index 6a40917b1ef..6ce22a28ed7 100644 --- a/usr/share/git/credential/osxkeychain/git-credential-osxkeychain.c +++ b/usr/share/git/credential/osxkeychain/git-credential-osxkeychain.c @@ -12,6 +12,7 @@ static CFStringRef username; static CFDataRef password; static CFDataRef password_expiry_utc; static CFDataRef oauth_refresh_token; +static int state_seen; static void clear_credential(void) { @@ -171,6 +172,9 @@ static OSStatus find_internet_password(void) CFRelease(item); + write_item("capability[]", "state", strlen("state")); + write_item("state[]", "osxkeychain:seen=1", strlen("osxkeychain:seen=1")); + out: CFRelease(attrs); @@ -284,6 +288,9 @@ static OSStatus add_internet_password(void) CFDictionaryRef attrs; OSStatus result; + if (state_seen) + return errSecSuccess; + /* Only store complete credentials */ if (!protocol || !host || !username || !password) return -1; @@ -395,6 +402,10 @@ static void read_credential(void) oauth_refresh_token = CFDataCreate(kCFAllocatorDefault, (UInt8 *)v, strlen(v)); + else if (!strcmp(buf, "state[]")) { + if (!strcmp(v, "osxkeychain:seen=1")) + state_seen = 1; + } /* * Ignore other lines; we don't know what they mean, but * this future-proofs us when later versions of git do @@ -414,6 +425,9 @@ int main(int argc, const char **argv) if (!argv[1]) die("%s", usage); + if (open(argv[0], O_RDONLY | O_EXLOCK) == -1) + die("failed to lock %s", argv[0]); + read_credential(); if (!strcmp(argv[1], "get")) diff --git a/usr/share/gitweb/gitweb.cgi b/usr/share/gitweb/gitweb.cgi index 7dd78c0d5d4..2fb89027972 100755 --- a/usr/share/gitweb/gitweb.cgi +++ b/usr/share/gitweb/gitweb.cgi @@ -35,7 +35,7 @@ BEGIN { CGI->compile() if $ENV{'MOD_PERL'}; } -our $version = "2.45.2"; +our $version = "2.46.0"; our ($my_url, $my_uri, $base_url, $path_info, $home_link); sub evaluate_uri { @@ -8326,10 +8326,10 @@ XML my %co = %{$commitlist[$i]}; my $commit = $co{'id'}; # we read 150, we always show 30 and the ones more recent than 48 hours - if (($i >= 20) && ((time - $co{'author_epoch'}) > 48*60*60)) { + if (($i >= 20) && ((time - $co{'committer_epoch'}) > 48*60*60)) { last; } - my %cd = parse_date($co{'author_epoch'}, $co{'author_tz'}); + my %cd = parse_date($co{'committer_epoch'}, $co{'committer_tz'}); # get list of changed files open my $fd, "-|", git_cmd(), "diff-tree", '-r', @diff_opts, diff --git a/usr/share/locale/bg/LC_MESSAGES/git.mo b/usr/share/locale/bg/LC_MESSAGES/git.mo index b61bdea366b..141c05294e9 100644 Binary files a/usr/share/locale/bg/LC_MESSAGES/git.mo and b/usr/share/locale/bg/LC_MESSAGES/git.mo differ diff --git a/usr/share/locale/de/LC_MESSAGES/git.mo b/usr/share/locale/de/LC_MESSAGES/git.mo index 5dc3e9fd614..03e95ca30c8 100644 Binary files a/usr/share/locale/de/LC_MESSAGES/git.mo and b/usr/share/locale/de/LC_MESSAGES/git.mo differ diff --git a/usr/share/locale/fr/LC_MESSAGES/git.mo b/usr/share/locale/fr/LC_MESSAGES/git.mo index 637d33085c1..8e11e62ce86 100644 Binary files a/usr/share/locale/fr/LC_MESSAGES/git.mo and b/usr/share/locale/fr/LC_MESSAGES/git.mo differ diff --git a/usr/share/locale/id/LC_MESSAGES/git.mo b/usr/share/locale/id/LC_MESSAGES/git.mo index 270f2f24bb3..06f0792437a 100644 Binary files a/usr/share/locale/id/LC_MESSAGES/git.mo and b/usr/share/locale/id/LC_MESSAGES/git.mo differ diff --git a/usr/share/locale/sv/LC_MESSAGES/git.mo b/usr/share/locale/sv/LC_MESSAGES/git.mo index d9a78af59af..8c4c1666185 100644 Binary files a/usr/share/locale/sv/LC_MESSAGES/git.mo and b/usr/share/locale/sv/LC_MESSAGES/git.mo differ diff --git a/usr/share/locale/tr/LC_MESSAGES/git.mo b/usr/share/locale/tr/LC_MESSAGES/git.mo index 5969a7964ba..f7f2cbebcbe 100644 Binary files a/usr/share/locale/tr/LC_MESSAGES/git.mo and b/usr/share/locale/tr/LC_MESSAGES/git.mo differ diff --git a/usr/share/locale/uk/LC_MESSAGES/git.mo b/usr/share/locale/uk/LC_MESSAGES/git.mo index 9278a3a16b6..80fae2e2f23 100644 Binary files a/usr/share/locale/uk/LC_MESSAGES/git.mo and b/usr/share/locale/uk/LC_MESSAGES/git.mo differ diff --git a/usr/share/locale/vi/LC_MESSAGES/git.mo b/usr/share/locale/vi/LC_MESSAGES/git.mo index d80a1e58e10..240a1a75bc5 100644 Binary files a/usr/share/locale/vi/LC_MESSAGES/git.mo and b/usr/share/locale/vi/LC_MESSAGES/git.mo differ diff --git a/usr/share/locale/zh_CN/LC_MESSAGES/git.mo b/usr/share/locale/zh_CN/LC_MESSAGES/git.mo index b1e55daf0f8..3424adde2a1 100644 Binary files a/usr/share/locale/zh_CN/LC_MESSAGES/git.mo and b/usr/share/locale/zh_CN/LC_MESSAGES/git.mo differ diff --git a/usr/share/locale/zh_TW/LC_MESSAGES/git.mo b/usr/share/locale/zh_TW/LC_MESSAGES/git.mo index d886f0dae86..6a5275a5ffb 100644 Binary files a/usr/share/locale/zh_TW/LC_MESSAGES/git.mo and b/usr/share/locale/zh_TW/LC_MESSAGES/git.mo differ diff --git a/usr/share/man/man1/git-add.1.gz b/usr/share/man/man1/git-add.1.gz index be1f9356dfd..25ff5050230 100644 Binary files a/usr/share/man/man1/git-add.1.gz and b/usr/share/man/man1/git-add.1.gz differ diff --git a/usr/share/man/man1/git-am.1.gz b/usr/share/man/man1/git-am.1.gz index daf2f3b8211..a294818741e 100644 Binary files a/usr/share/man/man1/git-am.1.gz and b/usr/share/man/man1/git-am.1.gz differ diff --git a/usr/share/man/man1/git-annotate.1.gz b/usr/share/man/man1/git-annotate.1.gz index 4116ed5e2b7..4b4ed0ddcd0 100644 Binary files a/usr/share/man/man1/git-annotate.1.gz and b/usr/share/man/man1/git-annotate.1.gz differ diff --git a/usr/share/man/man1/git-apply.1.gz b/usr/share/man/man1/git-apply.1.gz index 5739da3ea37..6413d7c1fa7 100644 Binary files a/usr/share/man/man1/git-apply.1.gz and b/usr/share/man/man1/git-apply.1.gz differ diff --git a/usr/share/man/man1/git-archimport.1.gz b/usr/share/man/man1/git-archimport.1.gz index 0b826e5f0c6..95b75a6d013 100644 Binary files a/usr/share/man/man1/git-archimport.1.gz and b/usr/share/man/man1/git-archimport.1.gz differ diff --git a/usr/share/man/man1/git-archive.1.gz b/usr/share/man/man1/git-archive.1.gz index 8613c2f4ad4..b0c0cb3da87 100644 Binary files a/usr/share/man/man1/git-archive.1.gz and b/usr/share/man/man1/git-archive.1.gz differ diff --git a/usr/share/man/man1/git-bisect.1.gz b/usr/share/man/man1/git-bisect.1.gz index 4f395eb1e9b..20fabdec5e9 100644 Binary files a/usr/share/man/man1/git-bisect.1.gz and b/usr/share/man/man1/git-bisect.1.gz differ diff --git a/usr/share/man/man1/git-blame.1.gz b/usr/share/man/man1/git-blame.1.gz index f174b1902f7..821313554db 100644 Binary files a/usr/share/man/man1/git-blame.1.gz and b/usr/share/man/man1/git-blame.1.gz differ diff --git a/usr/share/man/man1/git-branch.1.gz b/usr/share/man/man1/git-branch.1.gz index bf365c29c2d..319433434fe 100644 Binary files a/usr/share/man/man1/git-branch.1.gz and b/usr/share/man/man1/git-branch.1.gz differ diff --git a/usr/share/man/man1/git-bugreport.1.gz b/usr/share/man/man1/git-bugreport.1.gz index 245a70db7cd..713ca67fe9f 100644 Binary files a/usr/share/man/man1/git-bugreport.1.gz and b/usr/share/man/man1/git-bugreport.1.gz differ diff --git a/usr/share/man/man1/git-bundle.1.gz b/usr/share/man/man1/git-bundle.1.gz index 79f6d72664f..4fd2ad98f70 100644 Binary files a/usr/share/man/man1/git-bundle.1.gz and b/usr/share/man/man1/git-bundle.1.gz differ diff --git a/usr/share/man/man1/git-cat-file.1.gz b/usr/share/man/man1/git-cat-file.1.gz index c4bd8bc05d3..b19124b31a8 100644 Binary files a/usr/share/man/man1/git-cat-file.1.gz and b/usr/share/man/man1/git-cat-file.1.gz differ diff --git a/usr/share/man/man1/git-check-attr.1.gz b/usr/share/man/man1/git-check-attr.1.gz index 349f2ede2d6..d0a1e2e1312 100644 Binary files a/usr/share/man/man1/git-check-attr.1.gz and b/usr/share/man/man1/git-check-attr.1.gz differ diff --git a/usr/share/man/man1/git-check-ignore.1.gz b/usr/share/man/man1/git-check-ignore.1.gz index 739c2382ce4..115b711db51 100644 Binary files a/usr/share/man/man1/git-check-ignore.1.gz and b/usr/share/man/man1/git-check-ignore.1.gz differ diff --git a/usr/share/man/man1/git-check-mailmap.1.gz b/usr/share/man/man1/git-check-mailmap.1.gz index 0ac341ca9a1..9ffba275fd8 100644 Binary files a/usr/share/man/man1/git-check-mailmap.1.gz and b/usr/share/man/man1/git-check-mailmap.1.gz differ diff --git a/usr/share/man/man1/git-check-ref-format.1.gz b/usr/share/man/man1/git-check-ref-format.1.gz index 7fc08bae849..29d2c2d4f3d 100644 Binary files a/usr/share/man/man1/git-check-ref-format.1.gz and b/usr/share/man/man1/git-check-ref-format.1.gz differ diff --git a/usr/share/man/man1/git-checkout-index.1.gz b/usr/share/man/man1/git-checkout-index.1.gz index 3e39296da0d..6abfa85cd89 100644 Binary files a/usr/share/man/man1/git-checkout-index.1.gz and b/usr/share/man/man1/git-checkout-index.1.gz differ diff --git a/usr/share/man/man1/git-checkout.1.gz b/usr/share/man/man1/git-checkout.1.gz index c0055352fee..3acbb2da4cd 100644 Binary files a/usr/share/man/man1/git-checkout.1.gz and b/usr/share/man/man1/git-checkout.1.gz differ diff --git a/usr/share/man/man1/git-cherry-pick.1.gz b/usr/share/man/man1/git-cherry-pick.1.gz index bb630653857..98549f256ec 100644 Binary files a/usr/share/man/man1/git-cherry-pick.1.gz and b/usr/share/man/man1/git-cherry-pick.1.gz differ diff --git a/usr/share/man/man1/git-cherry.1.gz b/usr/share/man/man1/git-cherry.1.gz index 7ca288f4c27..d36f9bea4c1 100644 Binary files a/usr/share/man/man1/git-cherry.1.gz and b/usr/share/man/man1/git-cherry.1.gz differ diff --git a/usr/share/man/man1/git-citool.1.gz b/usr/share/man/man1/git-citool.1.gz index b53cfb175e9..529e6fab236 100644 Binary files a/usr/share/man/man1/git-citool.1.gz and b/usr/share/man/man1/git-citool.1.gz differ diff --git a/usr/share/man/man1/git-clean.1.gz b/usr/share/man/man1/git-clean.1.gz index 5ad0c74d3bf..1e774c87f45 100644 Binary files a/usr/share/man/man1/git-clean.1.gz and b/usr/share/man/man1/git-clean.1.gz differ diff --git a/usr/share/man/man1/git-clone.1.gz b/usr/share/man/man1/git-clone.1.gz index 7ad3b4e6d0d..0b5dcd14c97 100644 Binary files a/usr/share/man/man1/git-clone.1.gz and b/usr/share/man/man1/git-clone.1.gz differ diff --git a/usr/share/man/man1/git-column.1.gz b/usr/share/man/man1/git-column.1.gz index 21ee8f0a0f7..93a5d894337 100644 Binary files a/usr/share/man/man1/git-column.1.gz and b/usr/share/man/man1/git-column.1.gz differ diff --git a/usr/share/man/man1/git-commit-graph.1.gz b/usr/share/man/man1/git-commit-graph.1.gz index 0378fc6e707..81f9cee80f0 100644 Binary files a/usr/share/man/man1/git-commit-graph.1.gz and b/usr/share/man/man1/git-commit-graph.1.gz differ diff --git a/usr/share/man/man1/git-commit-tree.1.gz b/usr/share/man/man1/git-commit-tree.1.gz index c92a198e004..9eeaa73e186 100644 Binary files a/usr/share/man/man1/git-commit-tree.1.gz and b/usr/share/man/man1/git-commit-tree.1.gz differ diff --git a/usr/share/man/man1/git-commit.1.gz b/usr/share/man/man1/git-commit.1.gz index 6f94430409b..022e241ba0b 100644 Binary files a/usr/share/man/man1/git-commit.1.gz and b/usr/share/man/man1/git-commit.1.gz differ diff --git a/usr/share/man/man1/git-config.1.gz b/usr/share/man/man1/git-config.1.gz index ea3106373bc..4936b4b3e4c 100644 Binary files a/usr/share/man/man1/git-config.1.gz and b/usr/share/man/man1/git-config.1.gz differ diff --git a/usr/share/man/man1/git-count-objects.1.gz b/usr/share/man/man1/git-count-objects.1.gz index 5e4a9e901cb..b6c3189452a 100644 Binary files a/usr/share/man/man1/git-count-objects.1.gz and b/usr/share/man/man1/git-count-objects.1.gz differ diff --git a/usr/share/man/man1/git-credential-cache--daemon.1.gz b/usr/share/man/man1/git-credential-cache--daemon.1.gz index 0b22caf5d0d..ad291029226 100644 Binary files a/usr/share/man/man1/git-credential-cache--daemon.1.gz and b/usr/share/man/man1/git-credential-cache--daemon.1.gz differ diff --git a/usr/share/man/man1/git-credential-cache.1.gz b/usr/share/man/man1/git-credential-cache.1.gz index 731a3ab9bd5..459c05bc854 100644 Binary files a/usr/share/man/man1/git-credential-cache.1.gz and b/usr/share/man/man1/git-credential-cache.1.gz differ diff --git a/usr/share/man/man1/git-credential-store.1.gz b/usr/share/man/man1/git-credential-store.1.gz index 15c329a79f4..a2cd0c75a19 100644 Binary files a/usr/share/man/man1/git-credential-store.1.gz and b/usr/share/man/man1/git-credential-store.1.gz differ diff --git a/usr/share/man/man1/git-credential.1.gz b/usr/share/man/man1/git-credential.1.gz index 2001dced5d7..f01c5f4509a 100644 Binary files a/usr/share/man/man1/git-credential.1.gz and b/usr/share/man/man1/git-credential.1.gz differ diff --git a/usr/share/man/man1/git-cvsexportcommit.1.gz b/usr/share/man/man1/git-cvsexportcommit.1.gz index 4bbf7372141..cedd4d232aa 100644 Binary files a/usr/share/man/man1/git-cvsexportcommit.1.gz and b/usr/share/man/man1/git-cvsexportcommit.1.gz differ diff --git a/usr/share/man/man1/git-cvsimport.1.gz b/usr/share/man/man1/git-cvsimport.1.gz index 2b5d4fa353f..809e9ab1c47 100644 Binary files a/usr/share/man/man1/git-cvsimport.1.gz and b/usr/share/man/man1/git-cvsimport.1.gz differ diff --git a/usr/share/man/man1/git-cvsserver.1.gz b/usr/share/man/man1/git-cvsserver.1.gz index c3b58f7bcb8..556d4cd3cca 100644 Binary files a/usr/share/man/man1/git-cvsserver.1.gz and b/usr/share/man/man1/git-cvsserver.1.gz differ diff --git a/usr/share/man/man1/git-daemon.1.gz b/usr/share/man/man1/git-daemon.1.gz index c763196168e..acc3c27c837 100644 Binary files a/usr/share/man/man1/git-daemon.1.gz and b/usr/share/man/man1/git-daemon.1.gz differ diff --git a/usr/share/man/man1/git-describe.1.gz b/usr/share/man/man1/git-describe.1.gz index 6882915bb4e..c85ae6d05f5 100644 Binary files a/usr/share/man/man1/git-describe.1.gz and b/usr/share/man/man1/git-describe.1.gz differ diff --git a/usr/share/man/man1/git-diagnose.1.gz b/usr/share/man/man1/git-diagnose.1.gz index 60b6d89a33a..5db56e5f210 100644 Binary files a/usr/share/man/man1/git-diagnose.1.gz and b/usr/share/man/man1/git-diagnose.1.gz differ diff --git a/usr/share/man/man1/git-diff-files.1.gz b/usr/share/man/man1/git-diff-files.1.gz index 60c3c91c511..b87ffe97c93 100644 Binary files a/usr/share/man/man1/git-diff-files.1.gz and b/usr/share/man/man1/git-diff-files.1.gz differ diff --git a/usr/share/man/man1/git-diff-index.1.gz b/usr/share/man/man1/git-diff-index.1.gz index 4229b326262..f3c457fcafd 100644 Binary files a/usr/share/man/man1/git-diff-index.1.gz and b/usr/share/man/man1/git-diff-index.1.gz differ diff --git a/usr/share/man/man1/git-diff-tree.1.gz b/usr/share/man/man1/git-diff-tree.1.gz index 0de504928a3..c7ea3372d76 100644 Binary files a/usr/share/man/man1/git-diff-tree.1.gz and b/usr/share/man/man1/git-diff-tree.1.gz differ diff --git a/usr/share/man/man1/git-diff.1.gz b/usr/share/man/man1/git-diff.1.gz index 472be6d30c1..51c3f4644ea 100644 Binary files a/usr/share/man/man1/git-diff.1.gz and b/usr/share/man/man1/git-diff.1.gz differ diff --git a/usr/share/man/man1/git-difftool.1.gz b/usr/share/man/man1/git-difftool.1.gz index cc7c03c5f1e..e4c07892a5c 100644 Binary files a/usr/share/man/man1/git-difftool.1.gz and b/usr/share/man/man1/git-difftool.1.gz differ diff --git a/usr/share/man/man1/git-fast-export.1.gz b/usr/share/man/man1/git-fast-export.1.gz index 25b8f3d01d6..985268946e6 100644 Binary files a/usr/share/man/man1/git-fast-export.1.gz and b/usr/share/man/man1/git-fast-export.1.gz differ diff --git a/usr/share/man/man1/git-fast-import.1.gz b/usr/share/man/man1/git-fast-import.1.gz index 1da85c667ee..0b5109a0d77 100644 Binary files a/usr/share/man/man1/git-fast-import.1.gz and b/usr/share/man/man1/git-fast-import.1.gz differ diff --git a/usr/share/man/man1/git-fetch-pack.1.gz b/usr/share/man/man1/git-fetch-pack.1.gz index 2162f2e9819..3ad4dc055ef 100644 Binary files a/usr/share/man/man1/git-fetch-pack.1.gz and b/usr/share/man/man1/git-fetch-pack.1.gz differ diff --git a/usr/share/man/man1/git-fetch.1.gz b/usr/share/man/man1/git-fetch.1.gz index 9f2846e2ad2..d48f56e9cb4 100644 Binary files a/usr/share/man/man1/git-fetch.1.gz and b/usr/share/man/man1/git-fetch.1.gz differ diff --git a/usr/share/man/man1/git-filter-branch.1.gz b/usr/share/man/man1/git-filter-branch.1.gz index e30a88590d7..366fcbee159 100644 Binary files a/usr/share/man/man1/git-filter-branch.1.gz and b/usr/share/man/man1/git-filter-branch.1.gz differ diff --git a/usr/share/man/man1/git-fmt-merge-msg.1.gz b/usr/share/man/man1/git-fmt-merge-msg.1.gz index 07cf7918ce5..018ac2f5cf1 100644 Binary files a/usr/share/man/man1/git-fmt-merge-msg.1.gz and b/usr/share/man/man1/git-fmt-merge-msg.1.gz differ diff --git a/usr/share/man/man1/git-for-each-ref.1.gz b/usr/share/man/man1/git-for-each-ref.1.gz index 02df49b1dd4..910ee04cbfd 100644 Binary files a/usr/share/man/man1/git-for-each-ref.1.gz and b/usr/share/man/man1/git-for-each-ref.1.gz differ diff --git a/usr/share/man/man1/git-for-each-repo.1.gz b/usr/share/man/man1/git-for-each-repo.1.gz index e754c2e527b..ad503bf301a 100644 Binary files a/usr/share/man/man1/git-for-each-repo.1.gz and b/usr/share/man/man1/git-for-each-repo.1.gz differ diff --git a/usr/share/man/man1/git-format-patch.1.gz b/usr/share/man/man1/git-format-patch.1.gz index 1c531c95480..39a3355e28c 100644 Binary files a/usr/share/man/man1/git-format-patch.1.gz and b/usr/share/man/man1/git-format-patch.1.gz differ diff --git a/usr/share/man/man1/git-fsck-objects.1.gz b/usr/share/man/man1/git-fsck-objects.1.gz index 025db8bd254..1cd48ed2904 100644 Binary files a/usr/share/man/man1/git-fsck-objects.1.gz and b/usr/share/man/man1/git-fsck-objects.1.gz differ diff --git a/usr/share/man/man1/git-fsck.1.gz b/usr/share/man/man1/git-fsck.1.gz index 83507653220..e6b785e1337 100644 Binary files a/usr/share/man/man1/git-fsck.1.gz and b/usr/share/man/man1/git-fsck.1.gz differ diff --git a/usr/share/man/man1/git-fsmonitor--daemon.1.gz b/usr/share/man/man1/git-fsmonitor--daemon.1.gz index 21835e8ba6e..7081ada9fd3 100644 Binary files a/usr/share/man/man1/git-fsmonitor--daemon.1.gz and b/usr/share/man/man1/git-fsmonitor--daemon.1.gz differ diff --git a/usr/share/man/man1/git-gc.1.gz b/usr/share/man/man1/git-gc.1.gz index f57ad63eec9..6f01c910f3f 100644 Binary files a/usr/share/man/man1/git-gc.1.gz and b/usr/share/man/man1/git-gc.1.gz differ diff --git a/usr/share/man/man1/git-get-tar-commit-id.1.gz b/usr/share/man/man1/git-get-tar-commit-id.1.gz index 4e5618fe002..3dbd1dffc37 100644 Binary files a/usr/share/man/man1/git-get-tar-commit-id.1.gz and b/usr/share/man/man1/git-get-tar-commit-id.1.gz differ diff --git a/usr/share/man/man1/git-grep.1.gz b/usr/share/man/man1/git-grep.1.gz index 4cd10d31a99..26522905a24 100644 Binary files a/usr/share/man/man1/git-grep.1.gz and b/usr/share/man/man1/git-grep.1.gz differ diff --git a/usr/share/man/man1/git-gui.1.gz b/usr/share/man/man1/git-gui.1.gz index fa6cd355faa..9cf386b0bcd 100644 Binary files a/usr/share/man/man1/git-gui.1.gz and b/usr/share/man/man1/git-gui.1.gz differ diff --git a/usr/share/man/man1/git-hash-object.1.gz b/usr/share/man/man1/git-hash-object.1.gz index bf971bea15b..aa1beacf7db 100644 Binary files a/usr/share/man/man1/git-hash-object.1.gz and b/usr/share/man/man1/git-hash-object.1.gz differ diff --git a/usr/share/man/man1/git-help.1.gz b/usr/share/man/man1/git-help.1.gz index a06285949f9..0016c7a9982 100644 Binary files a/usr/share/man/man1/git-help.1.gz and b/usr/share/man/man1/git-help.1.gz differ diff --git a/usr/share/man/man1/git-hook.1.gz b/usr/share/man/man1/git-hook.1.gz index b636e2a023f..e3f5737903d 100644 Binary files a/usr/share/man/man1/git-hook.1.gz and b/usr/share/man/man1/git-hook.1.gz differ diff --git a/usr/share/man/man1/git-http-backend.1.gz b/usr/share/man/man1/git-http-backend.1.gz index 0f9185f0f1a..7bbe73e458a 100644 Binary files a/usr/share/man/man1/git-http-backend.1.gz and b/usr/share/man/man1/git-http-backend.1.gz differ diff --git a/usr/share/man/man1/git-http-fetch.1.gz b/usr/share/man/man1/git-http-fetch.1.gz index 0cbb1847000..2f8807f34a2 100644 Binary files a/usr/share/man/man1/git-http-fetch.1.gz and b/usr/share/man/man1/git-http-fetch.1.gz differ diff --git a/usr/share/man/man1/git-http-push.1.gz b/usr/share/man/man1/git-http-push.1.gz index a5673b7f3fb..d5c3e5c4128 100644 Binary files a/usr/share/man/man1/git-http-push.1.gz and b/usr/share/man/man1/git-http-push.1.gz differ diff --git a/usr/share/man/man1/git-imap-send.1.gz b/usr/share/man/man1/git-imap-send.1.gz index 40c9d21dc4c..8a42bd396d7 100644 Binary files a/usr/share/man/man1/git-imap-send.1.gz and b/usr/share/man/man1/git-imap-send.1.gz differ diff --git a/usr/share/man/man1/git-index-pack.1.gz b/usr/share/man/man1/git-index-pack.1.gz index f6c67f96b14..19cd4e62754 100644 Binary files a/usr/share/man/man1/git-index-pack.1.gz and b/usr/share/man/man1/git-index-pack.1.gz differ diff --git a/usr/share/man/man1/git-init-db.1.gz b/usr/share/man/man1/git-init-db.1.gz index 30e5fa2a4f1..bd17229a125 100644 Binary files a/usr/share/man/man1/git-init-db.1.gz and b/usr/share/man/man1/git-init-db.1.gz differ diff --git a/usr/share/man/man1/git-init.1.gz b/usr/share/man/man1/git-init.1.gz index 1d7c73e8b45..7540541763c 100644 Binary files a/usr/share/man/man1/git-init.1.gz and b/usr/share/man/man1/git-init.1.gz differ diff --git a/usr/share/man/man1/git-instaweb.1.gz b/usr/share/man/man1/git-instaweb.1.gz index 2d10a055d8c..2f1d3b00060 100644 Binary files a/usr/share/man/man1/git-instaweb.1.gz and b/usr/share/man/man1/git-instaweb.1.gz differ diff --git a/usr/share/man/man1/git-interpret-trailers.1.gz b/usr/share/man/man1/git-interpret-trailers.1.gz index 4cf0058bd44..b53e11234c9 100644 Binary files a/usr/share/man/man1/git-interpret-trailers.1.gz and b/usr/share/man/man1/git-interpret-trailers.1.gz differ diff --git a/usr/share/man/man1/git-log.1.gz b/usr/share/man/man1/git-log.1.gz index 68cd2b2598d..0f1406ef63b 100644 Binary files a/usr/share/man/man1/git-log.1.gz and b/usr/share/man/man1/git-log.1.gz differ diff --git a/usr/share/man/man1/git-ls-files.1.gz b/usr/share/man/man1/git-ls-files.1.gz index 5f49ca84e40..3b3b0c52486 100644 Binary files a/usr/share/man/man1/git-ls-files.1.gz and b/usr/share/man/man1/git-ls-files.1.gz differ diff --git a/usr/share/man/man1/git-ls-remote.1.gz b/usr/share/man/man1/git-ls-remote.1.gz index 7559469df8f..4dce0ef239d 100644 Binary files a/usr/share/man/man1/git-ls-remote.1.gz and b/usr/share/man/man1/git-ls-remote.1.gz differ diff --git a/usr/share/man/man1/git-ls-tree.1.gz b/usr/share/man/man1/git-ls-tree.1.gz index 2b4470df8f5..bd3cf9ebfe3 100644 Binary files a/usr/share/man/man1/git-ls-tree.1.gz and b/usr/share/man/man1/git-ls-tree.1.gz differ diff --git a/usr/share/man/man1/git-mailinfo.1.gz b/usr/share/man/man1/git-mailinfo.1.gz index b0d76a6b993..c9503a6eb6d 100644 Binary files a/usr/share/man/man1/git-mailinfo.1.gz and b/usr/share/man/man1/git-mailinfo.1.gz differ diff --git a/usr/share/man/man1/git-mailsplit.1.gz b/usr/share/man/man1/git-mailsplit.1.gz index ebd2687aa6f..8d6bca4d586 100644 Binary files a/usr/share/man/man1/git-mailsplit.1.gz and b/usr/share/man/man1/git-mailsplit.1.gz differ diff --git a/usr/share/man/man1/git-maintenance.1.gz b/usr/share/man/man1/git-maintenance.1.gz index 866d297f3f6..7714045fe09 100644 Binary files a/usr/share/man/man1/git-maintenance.1.gz and b/usr/share/man/man1/git-maintenance.1.gz differ diff --git a/usr/share/man/man1/git-merge-base.1.gz b/usr/share/man/man1/git-merge-base.1.gz index b35863eb341..55bbda67d92 100644 Binary files a/usr/share/man/man1/git-merge-base.1.gz and b/usr/share/man/man1/git-merge-base.1.gz differ diff --git a/usr/share/man/man1/git-merge-file.1.gz b/usr/share/man/man1/git-merge-file.1.gz index ce8c838a072..2bd2b676d2f 100644 Binary files a/usr/share/man/man1/git-merge-file.1.gz and b/usr/share/man/man1/git-merge-file.1.gz differ diff --git a/usr/share/man/man1/git-merge-index.1.gz b/usr/share/man/man1/git-merge-index.1.gz index 83512b6e31c..e1f24815842 100644 Binary files a/usr/share/man/man1/git-merge-index.1.gz and b/usr/share/man/man1/git-merge-index.1.gz differ diff --git a/usr/share/man/man1/git-merge-one-file.1.gz b/usr/share/man/man1/git-merge-one-file.1.gz index 121aedec577..15319eff4f2 100644 Binary files a/usr/share/man/man1/git-merge-one-file.1.gz and b/usr/share/man/man1/git-merge-one-file.1.gz differ diff --git a/usr/share/man/man1/git-merge-tree.1.gz b/usr/share/man/man1/git-merge-tree.1.gz index 94cbfe35a0a..fd39bfba248 100644 Binary files a/usr/share/man/man1/git-merge-tree.1.gz and b/usr/share/man/man1/git-merge-tree.1.gz differ diff --git a/usr/share/man/man1/git-merge.1.gz b/usr/share/man/man1/git-merge.1.gz index c40a5a82967..f040a38a28e 100644 Binary files a/usr/share/man/man1/git-merge.1.gz and b/usr/share/man/man1/git-merge.1.gz differ diff --git a/usr/share/man/man1/git-mergetool--lib.1.gz b/usr/share/man/man1/git-mergetool--lib.1.gz index f6e049d8b63..d52aef6e98f 100644 Binary files a/usr/share/man/man1/git-mergetool--lib.1.gz and b/usr/share/man/man1/git-mergetool--lib.1.gz differ diff --git a/usr/share/man/man1/git-mergetool.1.gz b/usr/share/man/man1/git-mergetool.1.gz index 1e5416ececa..d5d3bfba979 100644 Binary files a/usr/share/man/man1/git-mergetool.1.gz and b/usr/share/man/man1/git-mergetool.1.gz differ diff --git a/usr/share/man/man1/git-mktag.1.gz b/usr/share/man/man1/git-mktag.1.gz index 14b01109fcb..972c884a2f0 100644 Binary files a/usr/share/man/man1/git-mktag.1.gz and b/usr/share/man/man1/git-mktag.1.gz differ diff --git a/usr/share/man/man1/git-mktree.1.gz b/usr/share/man/man1/git-mktree.1.gz index 1a1f10db40c..87684d5c9b1 100644 Binary files a/usr/share/man/man1/git-mktree.1.gz and b/usr/share/man/man1/git-mktree.1.gz differ diff --git a/usr/share/man/man1/git-multi-pack-index.1.gz b/usr/share/man/man1/git-multi-pack-index.1.gz index 6069c2b2865..1358f93fd5b 100644 Binary files a/usr/share/man/man1/git-multi-pack-index.1.gz and b/usr/share/man/man1/git-multi-pack-index.1.gz differ diff --git a/usr/share/man/man1/git-mv.1.gz b/usr/share/man/man1/git-mv.1.gz index 568b0b986a0..85d9d187876 100644 Binary files a/usr/share/man/man1/git-mv.1.gz and b/usr/share/man/man1/git-mv.1.gz differ diff --git a/usr/share/man/man1/git-name-rev.1.gz b/usr/share/man/man1/git-name-rev.1.gz index 09c11e2c1c6..05ab683a89a 100644 Binary files a/usr/share/man/man1/git-name-rev.1.gz and b/usr/share/man/man1/git-name-rev.1.gz differ diff --git a/usr/share/man/man1/git-notes.1.gz b/usr/share/man/man1/git-notes.1.gz index a53a1418479..cc68d5abee8 100644 Binary files a/usr/share/man/man1/git-notes.1.gz and b/usr/share/man/man1/git-notes.1.gz differ diff --git a/usr/share/man/man1/git-p4.1.gz b/usr/share/man/man1/git-p4.1.gz index f5907071d2e..a7072a24aa4 100644 Binary files a/usr/share/man/man1/git-p4.1.gz and b/usr/share/man/man1/git-p4.1.gz differ diff --git a/usr/share/man/man1/git-pack-objects.1.gz b/usr/share/man/man1/git-pack-objects.1.gz index 720c009fd81..c7faef00fc7 100644 Binary files a/usr/share/man/man1/git-pack-objects.1.gz and b/usr/share/man/man1/git-pack-objects.1.gz differ diff --git a/usr/share/man/man1/git-pack-redundant.1.gz b/usr/share/man/man1/git-pack-redundant.1.gz index 34cb19813c2..018c909e1f9 100644 Binary files a/usr/share/man/man1/git-pack-redundant.1.gz and b/usr/share/man/man1/git-pack-redundant.1.gz differ diff --git a/usr/share/man/man1/git-pack-refs.1.gz b/usr/share/man/man1/git-pack-refs.1.gz index 1dccefc1c6d..d48da08dc7a 100644 Binary files a/usr/share/man/man1/git-pack-refs.1.gz and b/usr/share/man/man1/git-pack-refs.1.gz differ diff --git a/usr/share/man/man1/git-patch-id.1.gz b/usr/share/man/man1/git-patch-id.1.gz index be4e83ad3f9..865fd6e1697 100644 Binary files a/usr/share/man/man1/git-patch-id.1.gz and b/usr/share/man/man1/git-patch-id.1.gz differ diff --git a/usr/share/man/man1/git-prune-packed.1.gz b/usr/share/man/man1/git-prune-packed.1.gz index 580b0c34cec..b6396dbee07 100644 Binary files a/usr/share/man/man1/git-prune-packed.1.gz and b/usr/share/man/man1/git-prune-packed.1.gz differ diff --git a/usr/share/man/man1/git-prune.1.gz b/usr/share/man/man1/git-prune.1.gz index f8443b1799a..924a03b533d 100644 Binary files a/usr/share/man/man1/git-prune.1.gz and b/usr/share/man/man1/git-prune.1.gz differ diff --git a/usr/share/man/man1/git-pull.1.gz b/usr/share/man/man1/git-pull.1.gz index 7a96b28d6a5..0928e6a6d3e 100644 Binary files a/usr/share/man/man1/git-pull.1.gz and b/usr/share/man/man1/git-pull.1.gz differ diff --git a/usr/share/man/man1/git-push.1.gz b/usr/share/man/man1/git-push.1.gz index 710a0ac473e..1916c9720a9 100644 Binary files a/usr/share/man/man1/git-push.1.gz and b/usr/share/man/man1/git-push.1.gz differ diff --git a/usr/share/man/man1/git-quiltimport.1.gz b/usr/share/man/man1/git-quiltimport.1.gz index ac925e252c1..8ef31ebe986 100644 Binary files a/usr/share/man/man1/git-quiltimport.1.gz and b/usr/share/man/man1/git-quiltimport.1.gz differ diff --git a/usr/share/man/man1/git-range-diff.1.gz b/usr/share/man/man1/git-range-diff.1.gz index 24dc73da653..2e42e6a3338 100644 Binary files a/usr/share/man/man1/git-range-diff.1.gz and b/usr/share/man/man1/git-range-diff.1.gz differ diff --git a/usr/share/man/man1/git-read-tree.1.gz b/usr/share/man/man1/git-read-tree.1.gz index 532025f4d4c..38233b1f448 100644 Binary files a/usr/share/man/man1/git-read-tree.1.gz and b/usr/share/man/man1/git-read-tree.1.gz differ diff --git a/usr/share/man/man1/git-rebase.1.gz b/usr/share/man/man1/git-rebase.1.gz index 0bb37a938c2..2c0e668b539 100644 Binary files a/usr/share/man/man1/git-rebase.1.gz and b/usr/share/man/man1/git-rebase.1.gz differ diff --git a/usr/share/man/man1/git-receive-pack.1.gz b/usr/share/man/man1/git-receive-pack.1.gz index 0ce351cd333..79d9bbbab5a 100644 Binary files a/usr/share/man/man1/git-receive-pack.1.gz and b/usr/share/man/man1/git-receive-pack.1.gz differ diff --git a/usr/share/man/man1/git-reflog.1.gz b/usr/share/man/man1/git-reflog.1.gz index 0ddd330efce..588d399192c 100644 Binary files a/usr/share/man/man1/git-reflog.1.gz and b/usr/share/man/man1/git-reflog.1.gz differ diff --git a/usr/share/man/man1/git-refs.1.gz b/usr/share/man/man1/git-refs.1.gz new file mode 100644 index 00000000000..cc79018a2fc Binary files /dev/null and b/usr/share/man/man1/git-refs.1.gz differ diff --git a/usr/share/man/man1/git-remote-ext.1.gz b/usr/share/man/man1/git-remote-ext.1.gz index fe7844cb94e..7fff468b356 100644 Binary files a/usr/share/man/man1/git-remote-ext.1.gz and b/usr/share/man/man1/git-remote-ext.1.gz differ diff --git a/usr/share/man/man1/git-remote-fd.1.gz b/usr/share/man/man1/git-remote-fd.1.gz index da10c7080a6..d34fae409f5 100644 Binary files a/usr/share/man/man1/git-remote-fd.1.gz and b/usr/share/man/man1/git-remote-fd.1.gz differ diff --git a/usr/share/man/man1/git-remote.1.gz b/usr/share/man/man1/git-remote.1.gz index 3ef2372f9b8..daa762703ad 100644 Binary files a/usr/share/man/man1/git-remote.1.gz and b/usr/share/man/man1/git-remote.1.gz differ diff --git a/usr/share/man/man1/git-repack.1.gz b/usr/share/man/man1/git-repack.1.gz index e494f6b13ce..73baf40511f 100644 Binary files a/usr/share/man/man1/git-repack.1.gz and b/usr/share/man/man1/git-repack.1.gz differ diff --git a/usr/share/man/man1/git-replace.1.gz b/usr/share/man/man1/git-replace.1.gz index 5905bdf4e83..302c091d0fb 100644 Binary files a/usr/share/man/man1/git-replace.1.gz and b/usr/share/man/man1/git-replace.1.gz differ diff --git a/usr/share/man/man1/git-replay.1.gz b/usr/share/man/man1/git-replay.1.gz index cced3dbe1e8..3f442babbdf 100644 Binary files a/usr/share/man/man1/git-replay.1.gz and b/usr/share/man/man1/git-replay.1.gz differ diff --git a/usr/share/man/man1/git-request-pull.1.gz b/usr/share/man/man1/git-request-pull.1.gz index b8a7f6e6718..84feca0c08a 100644 Binary files a/usr/share/man/man1/git-request-pull.1.gz and b/usr/share/man/man1/git-request-pull.1.gz differ diff --git a/usr/share/man/man1/git-rerere.1.gz b/usr/share/man/man1/git-rerere.1.gz index 921b8e0fd24..fa89587e36e 100644 Binary files a/usr/share/man/man1/git-rerere.1.gz and b/usr/share/man/man1/git-rerere.1.gz differ diff --git a/usr/share/man/man1/git-reset.1.gz b/usr/share/man/man1/git-reset.1.gz index 228646c7222..f009675cdd1 100644 Binary files a/usr/share/man/man1/git-reset.1.gz and b/usr/share/man/man1/git-reset.1.gz differ diff --git a/usr/share/man/man1/git-restore.1.gz b/usr/share/man/man1/git-restore.1.gz index 81fc1c0f046..79555a817cb 100644 Binary files a/usr/share/man/man1/git-restore.1.gz and b/usr/share/man/man1/git-restore.1.gz differ diff --git a/usr/share/man/man1/git-rev-list.1.gz b/usr/share/man/man1/git-rev-list.1.gz index 22bc59b1059..2352e8a3a3e 100644 Binary files a/usr/share/man/man1/git-rev-list.1.gz and b/usr/share/man/man1/git-rev-list.1.gz differ diff --git a/usr/share/man/man1/git-rev-parse.1.gz b/usr/share/man/man1/git-rev-parse.1.gz index 09721bfc90b..efa59ce5ec5 100644 Binary files a/usr/share/man/man1/git-rev-parse.1.gz and b/usr/share/man/man1/git-rev-parse.1.gz differ diff --git a/usr/share/man/man1/git-revert.1.gz b/usr/share/man/man1/git-revert.1.gz index bdc178f0b5c..6ea334a8ca2 100644 Binary files a/usr/share/man/man1/git-revert.1.gz and b/usr/share/man/man1/git-revert.1.gz differ diff --git a/usr/share/man/man1/git-rm.1.gz b/usr/share/man/man1/git-rm.1.gz index a24841d042c..304506af8c0 100644 Binary files a/usr/share/man/man1/git-rm.1.gz and b/usr/share/man/man1/git-rm.1.gz differ diff --git a/usr/share/man/man1/git-send-email.1.gz b/usr/share/man/man1/git-send-email.1.gz index 9234b9df09c..1c263fe8f59 100644 Binary files a/usr/share/man/man1/git-send-email.1.gz and b/usr/share/man/man1/git-send-email.1.gz differ diff --git a/usr/share/man/man1/git-send-pack.1.gz b/usr/share/man/man1/git-send-pack.1.gz index 64a601d4350..d5376babefd 100644 Binary files a/usr/share/man/man1/git-send-pack.1.gz and b/usr/share/man/man1/git-send-pack.1.gz differ diff --git a/usr/share/man/man1/git-sh-i18n--envsubst.1.gz b/usr/share/man/man1/git-sh-i18n--envsubst.1.gz index f4a3bcf45f4..657f39747f3 100644 Binary files a/usr/share/man/man1/git-sh-i18n--envsubst.1.gz and b/usr/share/man/man1/git-sh-i18n--envsubst.1.gz differ diff --git a/usr/share/man/man1/git-sh-i18n.1.gz b/usr/share/man/man1/git-sh-i18n.1.gz index 878a961bb6a..6831bdc66df 100644 Binary files a/usr/share/man/man1/git-sh-i18n.1.gz and b/usr/share/man/man1/git-sh-i18n.1.gz differ diff --git a/usr/share/man/man1/git-sh-setup.1.gz b/usr/share/man/man1/git-sh-setup.1.gz index 7e53a621a1c..72996da7c2d 100644 Binary files a/usr/share/man/man1/git-sh-setup.1.gz and b/usr/share/man/man1/git-sh-setup.1.gz differ diff --git a/usr/share/man/man1/git-shell.1.gz b/usr/share/man/man1/git-shell.1.gz index ad2e93f783c..91c8127c594 100644 Binary files a/usr/share/man/man1/git-shell.1.gz and b/usr/share/man/man1/git-shell.1.gz differ diff --git a/usr/share/man/man1/git-shortlog.1.gz b/usr/share/man/man1/git-shortlog.1.gz index 897c7119046..52c142a621f 100644 Binary files a/usr/share/man/man1/git-shortlog.1.gz and b/usr/share/man/man1/git-shortlog.1.gz differ diff --git a/usr/share/man/man1/git-show-branch.1.gz b/usr/share/man/man1/git-show-branch.1.gz index 5b105ed5ae7..11658cf9071 100644 Binary files a/usr/share/man/man1/git-show-branch.1.gz and b/usr/share/man/man1/git-show-branch.1.gz differ diff --git a/usr/share/man/man1/git-show-index.1.gz b/usr/share/man/man1/git-show-index.1.gz index 4a76e622eb3..9028aa0bc41 100644 Binary files a/usr/share/man/man1/git-show-index.1.gz and b/usr/share/man/man1/git-show-index.1.gz differ diff --git a/usr/share/man/man1/git-show-ref.1.gz b/usr/share/man/man1/git-show-ref.1.gz index 840168865af..22506609204 100644 Binary files a/usr/share/man/man1/git-show-ref.1.gz and b/usr/share/man/man1/git-show-ref.1.gz differ diff --git a/usr/share/man/man1/git-show.1.gz b/usr/share/man/man1/git-show.1.gz index 1da81fd613e..1dbc490eb6f 100644 Binary files a/usr/share/man/man1/git-show.1.gz and b/usr/share/man/man1/git-show.1.gz differ diff --git a/usr/share/man/man1/git-sparse-checkout.1.gz b/usr/share/man/man1/git-sparse-checkout.1.gz index 3ae858952af..00c067c2f01 100644 Binary files a/usr/share/man/man1/git-sparse-checkout.1.gz and b/usr/share/man/man1/git-sparse-checkout.1.gz differ diff --git a/usr/share/man/man1/git-stage.1.gz b/usr/share/man/man1/git-stage.1.gz index 5ddc80805e0..ce4a52a7321 100644 Binary files a/usr/share/man/man1/git-stage.1.gz and b/usr/share/man/man1/git-stage.1.gz differ diff --git a/usr/share/man/man1/git-stash.1.gz b/usr/share/man/man1/git-stash.1.gz index 8bb0497969f..209931e51a7 100644 Binary files a/usr/share/man/man1/git-stash.1.gz and b/usr/share/man/man1/git-stash.1.gz differ diff --git a/usr/share/man/man1/git-status.1.gz b/usr/share/man/man1/git-status.1.gz index e61cdee140e..e92c2e8d6da 100644 Binary files a/usr/share/man/man1/git-status.1.gz and b/usr/share/man/man1/git-status.1.gz differ diff --git a/usr/share/man/man1/git-stripspace.1.gz b/usr/share/man/man1/git-stripspace.1.gz index b3fe4d564c1..6646c9aae79 100644 Binary files a/usr/share/man/man1/git-stripspace.1.gz and b/usr/share/man/man1/git-stripspace.1.gz differ diff --git a/usr/share/man/man1/git-submodule.1.gz b/usr/share/man/man1/git-submodule.1.gz index 89e8699d683..67943ac7b9d 100644 Binary files a/usr/share/man/man1/git-submodule.1.gz and b/usr/share/man/man1/git-submodule.1.gz differ diff --git a/usr/share/man/man1/git-svn.1.gz b/usr/share/man/man1/git-svn.1.gz index 4b436fe2b8e..0533ecda252 100644 Binary files a/usr/share/man/man1/git-svn.1.gz and b/usr/share/man/man1/git-svn.1.gz differ diff --git a/usr/share/man/man1/git-switch.1.gz b/usr/share/man/man1/git-switch.1.gz index 3592b840b0f..af926ff958c 100644 Binary files a/usr/share/man/man1/git-switch.1.gz and b/usr/share/man/man1/git-switch.1.gz differ diff --git a/usr/share/man/man1/git-symbolic-ref.1.gz b/usr/share/man/man1/git-symbolic-ref.1.gz index f0c79257913..50dee9b57d8 100644 Binary files a/usr/share/man/man1/git-symbolic-ref.1.gz and b/usr/share/man/man1/git-symbolic-ref.1.gz differ diff --git a/usr/share/man/man1/git-tag.1.gz b/usr/share/man/man1/git-tag.1.gz index 289c608f0de..ed7b4cb4a8c 100644 Binary files a/usr/share/man/man1/git-tag.1.gz and b/usr/share/man/man1/git-tag.1.gz differ diff --git a/usr/share/man/man1/git-unpack-file.1.gz b/usr/share/man/man1/git-unpack-file.1.gz index 5ad3df9c4c4..a7634dc3ee6 100644 Binary files a/usr/share/man/man1/git-unpack-file.1.gz and b/usr/share/man/man1/git-unpack-file.1.gz differ diff --git a/usr/share/man/man1/git-unpack-objects.1.gz b/usr/share/man/man1/git-unpack-objects.1.gz index 86056e6ce93..3990f39df99 100644 Binary files a/usr/share/man/man1/git-unpack-objects.1.gz and b/usr/share/man/man1/git-unpack-objects.1.gz differ diff --git a/usr/share/man/man1/git-update-index.1.gz b/usr/share/man/man1/git-update-index.1.gz index af6583f28b6..38455bcb9b6 100644 Binary files a/usr/share/man/man1/git-update-index.1.gz and b/usr/share/man/man1/git-update-index.1.gz differ diff --git a/usr/share/man/man1/git-update-ref.1.gz b/usr/share/man/man1/git-update-ref.1.gz index 35402b82655..24115166870 100644 Binary files a/usr/share/man/man1/git-update-ref.1.gz and b/usr/share/man/man1/git-update-ref.1.gz differ diff --git a/usr/share/man/man1/git-update-server-info.1.gz b/usr/share/man/man1/git-update-server-info.1.gz index b066203aaef..eaf1836f2a1 100644 Binary files a/usr/share/man/man1/git-update-server-info.1.gz and b/usr/share/man/man1/git-update-server-info.1.gz differ diff --git a/usr/share/man/man1/git-upload-archive.1.gz b/usr/share/man/man1/git-upload-archive.1.gz index 00913db2fea..18a55ca1f9c 100644 Binary files a/usr/share/man/man1/git-upload-archive.1.gz and b/usr/share/man/man1/git-upload-archive.1.gz differ diff --git a/usr/share/man/man1/git-upload-pack.1.gz b/usr/share/man/man1/git-upload-pack.1.gz index 7c4e81fe0f2..9f2c3dbdbbd 100644 Binary files a/usr/share/man/man1/git-upload-pack.1.gz and b/usr/share/man/man1/git-upload-pack.1.gz differ diff --git a/usr/share/man/man1/git-var.1.gz b/usr/share/man/man1/git-var.1.gz index cec479281e9..31270fb2e0a 100644 Binary files a/usr/share/man/man1/git-var.1.gz and b/usr/share/man/man1/git-var.1.gz differ diff --git a/usr/share/man/man1/git-verify-commit.1.gz b/usr/share/man/man1/git-verify-commit.1.gz index d35331aa15b..a28bf5c8feb 100644 Binary files a/usr/share/man/man1/git-verify-commit.1.gz and b/usr/share/man/man1/git-verify-commit.1.gz differ diff --git a/usr/share/man/man1/git-verify-pack.1.gz b/usr/share/man/man1/git-verify-pack.1.gz index 818157e2774..8e39e4ac62d 100644 Binary files a/usr/share/man/man1/git-verify-pack.1.gz and b/usr/share/man/man1/git-verify-pack.1.gz differ diff --git a/usr/share/man/man1/git-verify-tag.1.gz b/usr/share/man/man1/git-verify-tag.1.gz index c440d0b8866..db8e4d2e4c1 100644 Binary files a/usr/share/man/man1/git-verify-tag.1.gz and b/usr/share/man/man1/git-verify-tag.1.gz differ diff --git a/usr/share/man/man1/git-version.1.gz b/usr/share/man/man1/git-version.1.gz index 6897afd49b1..59ea2fe594c 100644 Binary files a/usr/share/man/man1/git-version.1.gz and b/usr/share/man/man1/git-version.1.gz differ diff --git a/usr/share/man/man1/git-web--browse.1.gz b/usr/share/man/man1/git-web--browse.1.gz index fd9b9602a42..4dd90d62219 100644 Binary files a/usr/share/man/man1/git-web--browse.1.gz and b/usr/share/man/man1/git-web--browse.1.gz differ diff --git a/usr/share/man/man1/git-whatchanged.1.gz b/usr/share/man/man1/git-whatchanged.1.gz index 2f0c1361e67..25cb63a8123 100644 Binary files a/usr/share/man/man1/git-whatchanged.1.gz and b/usr/share/man/man1/git-whatchanged.1.gz differ diff --git a/usr/share/man/man1/git-worktree.1.gz b/usr/share/man/man1/git-worktree.1.gz index 208a02baa08..bc41e8ab140 100644 Binary files a/usr/share/man/man1/git-worktree.1.gz and b/usr/share/man/man1/git-worktree.1.gz differ diff --git a/usr/share/man/man1/git-write-tree.1.gz b/usr/share/man/man1/git-write-tree.1.gz index 93ca7a55a9c..731315e688c 100644 Binary files a/usr/share/man/man1/git-write-tree.1.gz and b/usr/share/man/man1/git-write-tree.1.gz differ diff --git a/usr/share/man/man1/git.1.gz b/usr/share/man/man1/git.1.gz index f0fc7b83a18..6a19a2cc760 100644 Binary files a/usr/share/man/man1/git.1.gz and b/usr/share/man/man1/git.1.gz differ diff --git a/usr/share/man/man1/gitk.1.gz b/usr/share/man/man1/gitk.1.gz index 600ec989bf9..9dce1e9bac2 100644 Binary files a/usr/share/man/man1/gitk.1.gz and b/usr/share/man/man1/gitk.1.gz differ diff --git a/usr/share/man/man1/gitweb.1.gz b/usr/share/man/man1/gitweb.1.gz index 49510378bd7..55570dd717f 100644 Binary files a/usr/share/man/man1/gitweb.1.gz and b/usr/share/man/man1/gitweb.1.gz differ diff --git a/usr/share/man/man1/scalar.1.gz b/usr/share/man/man1/scalar.1.gz index ab5c6332ec9..567a8de21cc 100644 Binary files a/usr/share/man/man1/scalar.1.gz and b/usr/share/man/man1/scalar.1.gz differ diff --git a/usr/share/man/man3/Git.3pm.gz b/usr/share/man/man3/Git.3pm.gz index 3f92f38706e..9d22585cd18 100644 Binary files a/usr/share/man/man3/Git.3pm.gz and b/usr/share/man/man3/Git.3pm.gz differ diff --git a/usr/share/man/man5/gitattributes.5.gz b/usr/share/man/man5/gitattributes.5.gz index a34112f9114..51cf9670be7 100644 Binary files a/usr/share/man/man5/gitattributes.5.gz and b/usr/share/man/man5/gitattributes.5.gz differ diff --git a/usr/share/man/man5/gitformat-bundle.5.gz b/usr/share/man/man5/gitformat-bundle.5.gz index abd90b12a78..513b11fcce2 100644 Binary files a/usr/share/man/man5/gitformat-bundle.5.gz and b/usr/share/man/man5/gitformat-bundle.5.gz differ diff --git a/usr/share/man/man5/gitformat-chunk.5.gz b/usr/share/man/man5/gitformat-chunk.5.gz index 3a06fe909ec..35ec5dc3db6 100644 Binary files a/usr/share/man/man5/gitformat-chunk.5.gz and b/usr/share/man/man5/gitformat-chunk.5.gz differ diff --git a/usr/share/man/man5/gitformat-commit-graph.5.gz b/usr/share/man/man5/gitformat-commit-graph.5.gz index 1dbe159c90b..4832a83a16b 100644 Binary files a/usr/share/man/man5/gitformat-commit-graph.5.gz and b/usr/share/man/man5/gitformat-commit-graph.5.gz differ diff --git a/usr/share/man/man5/gitformat-index.5.gz b/usr/share/man/man5/gitformat-index.5.gz index 7cd838f464e..c63c933ba18 100644 Binary files a/usr/share/man/man5/gitformat-index.5.gz and b/usr/share/man/man5/gitformat-index.5.gz differ diff --git a/usr/share/man/man5/gitformat-pack.5.gz b/usr/share/man/man5/gitformat-pack.5.gz index 5f6c3d7dad2..b7c6a52648e 100644 Binary files a/usr/share/man/man5/gitformat-pack.5.gz and b/usr/share/man/man5/gitformat-pack.5.gz differ diff --git a/usr/share/man/man5/gitformat-signature.5.gz b/usr/share/man/man5/gitformat-signature.5.gz index 833367f51f6..8f8e76d8f93 100644 Binary files a/usr/share/man/man5/gitformat-signature.5.gz and b/usr/share/man/man5/gitformat-signature.5.gz differ diff --git a/usr/share/man/man5/githooks.5.gz b/usr/share/man/man5/githooks.5.gz index bd0cd816115..7d686d08b65 100644 Binary files a/usr/share/man/man5/githooks.5.gz and b/usr/share/man/man5/githooks.5.gz differ diff --git a/usr/share/man/man5/gitignore.5.gz b/usr/share/man/man5/gitignore.5.gz index c5d2ab64e1d..413a757ce40 100644 Binary files a/usr/share/man/man5/gitignore.5.gz and b/usr/share/man/man5/gitignore.5.gz differ diff --git a/usr/share/man/man5/gitmailmap.5.gz b/usr/share/man/man5/gitmailmap.5.gz index 255a0eb8dda..cf767241edc 100644 Binary files a/usr/share/man/man5/gitmailmap.5.gz and b/usr/share/man/man5/gitmailmap.5.gz differ diff --git a/usr/share/man/man5/gitmodules.5.gz b/usr/share/man/man5/gitmodules.5.gz index 17fda917b32..1c2a1d41719 100644 Binary files a/usr/share/man/man5/gitmodules.5.gz and b/usr/share/man/man5/gitmodules.5.gz differ diff --git a/usr/share/man/man5/gitprotocol-capabilities.5.gz b/usr/share/man/man5/gitprotocol-capabilities.5.gz index cddf30b32c8..376f62eb6c7 100644 Binary files a/usr/share/man/man5/gitprotocol-capabilities.5.gz and b/usr/share/man/man5/gitprotocol-capabilities.5.gz differ diff --git a/usr/share/man/man5/gitprotocol-common.5.gz b/usr/share/man/man5/gitprotocol-common.5.gz index 6ae472435e9..57687f4f141 100644 Binary files a/usr/share/man/man5/gitprotocol-common.5.gz and b/usr/share/man/man5/gitprotocol-common.5.gz differ diff --git a/usr/share/man/man5/gitprotocol-http.5.gz b/usr/share/man/man5/gitprotocol-http.5.gz index f10ece95bcf..2bd4f981c1f 100644 Binary files a/usr/share/man/man5/gitprotocol-http.5.gz and b/usr/share/man/man5/gitprotocol-http.5.gz differ diff --git a/usr/share/man/man5/gitprotocol-pack.5.gz b/usr/share/man/man5/gitprotocol-pack.5.gz index 199746ad155..97e2f700916 100644 Binary files a/usr/share/man/man5/gitprotocol-pack.5.gz and b/usr/share/man/man5/gitprotocol-pack.5.gz differ diff --git a/usr/share/man/man5/gitprotocol-v2.5.gz b/usr/share/man/man5/gitprotocol-v2.5.gz index ea1b6bbd79f..49fa5d138bf 100644 Binary files a/usr/share/man/man5/gitprotocol-v2.5.gz and b/usr/share/man/man5/gitprotocol-v2.5.gz differ diff --git a/usr/share/man/man5/gitrepository-layout.5.gz b/usr/share/man/man5/gitrepository-layout.5.gz index 2389e390c1d..0eee29224fd 100644 Binary files a/usr/share/man/man5/gitrepository-layout.5.gz and b/usr/share/man/man5/gitrepository-layout.5.gz differ diff --git a/usr/share/man/man5/gitweb.conf.5.gz b/usr/share/man/man5/gitweb.conf.5.gz index ac8c5dd4fba..245756e47a4 100644 Binary files a/usr/share/man/man5/gitweb.conf.5.gz and b/usr/share/man/man5/gitweb.conf.5.gz differ diff --git a/usr/share/man/man7/gitcli.7.gz b/usr/share/man/man7/gitcli.7.gz index 08961a82510..510981665f0 100644 Binary files a/usr/share/man/man7/gitcli.7.gz and b/usr/share/man/man7/gitcli.7.gz differ diff --git a/usr/share/man/man7/gitcore-tutorial.7.gz b/usr/share/man/man7/gitcore-tutorial.7.gz index b62e73f9b66..99bf75dd17c 100644 Binary files a/usr/share/man/man7/gitcore-tutorial.7.gz and b/usr/share/man/man7/gitcore-tutorial.7.gz differ diff --git a/usr/share/man/man7/gitcredentials.7.gz b/usr/share/man/man7/gitcredentials.7.gz index b5915c60e2e..9a5ef2673d1 100644 Binary files a/usr/share/man/man7/gitcredentials.7.gz and b/usr/share/man/man7/gitcredentials.7.gz differ diff --git a/usr/share/man/man7/gitcvs-migration.7.gz b/usr/share/man/man7/gitcvs-migration.7.gz index 70e75a04a7f..727464e6f9d 100644 Binary files a/usr/share/man/man7/gitcvs-migration.7.gz and b/usr/share/man/man7/gitcvs-migration.7.gz differ diff --git a/usr/share/man/man7/gitdiffcore.7.gz b/usr/share/man/man7/gitdiffcore.7.gz index acab6471472..22666db651b 100644 Binary files a/usr/share/man/man7/gitdiffcore.7.gz and b/usr/share/man/man7/gitdiffcore.7.gz differ diff --git a/usr/share/man/man7/giteveryday.7.gz b/usr/share/man/man7/giteveryday.7.gz index c9c871d8933..4729872c299 100644 Binary files a/usr/share/man/man7/giteveryday.7.gz and b/usr/share/man/man7/giteveryday.7.gz differ diff --git a/usr/share/man/man7/gitfaq.7.gz b/usr/share/man/man7/gitfaq.7.gz index 9401d18cbc3..5efe9219b1b 100644 Binary files a/usr/share/man/man7/gitfaq.7.gz and b/usr/share/man/man7/gitfaq.7.gz differ diff --git a/usr/share/man/man7/gitglossary.7.gz b/usr/share/man/man7/gitglossary.7.gz index 3204c4d8dde..2bc23c379d9 100644 Binary files a/usr/share/man/man7/gitglossary.7.gz and b/usr/share/man/man7/gitglossary.7.gz differ diff --git a/usr/share/man/man7/gitnamespaces.7.gz b/usr/share/man/man7/gitnamespaces.7.gz index 16dc8f0e9e2..d79962a69a8 100644 Binary files a/usr/share/man/man7/gitnamespaces.7.gz and b/usr/share/man/man7/gitnamespaces.7.gz differ diff --git a/usr/share/man/man7/gitpacking.7.gz b/usr/share/man/man7/gitpacking.7.gz new file mode 100644 index 00000000000..f08e2083c29 Binary files /dev/null and b/usr/share/man/man7/gitpacking.7.gz differ diff --git a/usr/share/man/man7/gitremote-helpers.7.gz b/usr/share/man/man7/gitremote-helpers.7.gz index 5bf14351f9f..f257add4f2c 100644 Binary files a/usr/share/man/man7/gitremote-helpers.7.gz and b/usr/share/man/man7/gitremote-helpers.7.gz differ diff --git a/usr/share/man/man7/gitrevisions.7.gz b/usr/share/man/man7/gitrevisions.7.gz index 0927f44816f..31d83bdbcd7 100644 Binary files a/usr/share/man/man7/gitrevisions.7.gz and b/usr/share/man/man7/gitrevisions.7.gz differ diff --git a/usr/share/man/man7/gitsubmodules.7.gz b/usr/share/man/man7/gitsubmodules.7.gz index e6656c221c6..66a1a038f92 100644 Binary files a/usr/share/man/man7/gitsubmodules.7.gz and b/usr/share/man/man7/gitsubmodules.7.gz differ diff --git a/usr/share/man/man7/gittutorial-2.7.gz b/usr/share/man/man7/gittutorial-2.7.gz index bc207edc99f..c1f6e193e8c 100644 Binary files a/usr/share/man/man7/gittutorial-2.7.gz and b/usr/share/man/man7/gittutorial-2.7.gz differ diff --git a/usr/share/man/man7/gittutorial.7.gz b/usr/share/man/man7/gittutorial.7.gz index c6c722ca718..e0bf7a258c3 100644 Binary files a/usr/share/man/man7/gittutorial.7.gz and b/usr/share/man/man7/gittutorial.7.gz differ diff --git a/usr/share/man/man7/gitworkflows.7.gz b/usr/share/man/man7/gitworkflows.7.gz index 4869d0fd8b0..1678636af85 100644 Binary files a/usr/share/man/man7/gitworkflows.7.gz and b/usr/share/man/man7/gitworkflows.7.gz differ diff --git a/usr/share/perl5/Git.pm b/usr/share/perl5/Git.pm index 03bf570bf4c..aebfe0c6e07 100644 --- a/usr/share/perl5/Git.pm +++ b/usr/share/perl5/Git.pm @@ -418,7 +418,7 @@ argument is required if you want to see the command name in the error message, and it is the fourth value returned by C. The call idiom is: - my ($pid, $in, $out, $ctx) = $r->command_bidi_pipe('cat-file --batch-check'); + my ($pid, $in, $out, $ctx) = $r->command_bidi_pipe(qw(cat-file --batch-check)); print $out "000000000\n"; while (<$in>) { ... } $r->command_close_bidi_pipe($pid, $in, $out, $ctx); @@ -431,7 +431,7 @@ C and C may be C if they have been closed prior to calling this function. This may be useful in a query-response type of commands where caller first writes a query and later reads response, eg: - my ($pid, $in, $out, $ctx) = $r->command_bidi_pipe('cat-file --batch-check'); + my ($pid, $in, $out, $ctx) = $r->command_bidi_pipe(qw(cat-file --batch-check)); print $out "000000000\n"; close $out; while (<$in>) { ... } diff --git a/var/lib/pacman/local/git-2.45.2-1/mtree b/var/lib/pacman/local/git-2.45.2-1/mtree deleted file mode 100644 index 5b962ad16c5..00000000000 Binary files a/var/lib/pacman/local/git-2.45.2-1/mtree and /dev/null differ diff --git a/var/lib/pacman/local/git-2.45.2-1/desc b/var/lib/pacman/local/git-2.46.0-1/desc similarity index 85% rename from var/lib/pacman/local/git-2.45.2-1/desc rename to var/lib/pacman/local/git-2.46.0-1/desc index 31759636b0b..ee3605061e0 100644 --- a/var/lib/pacman/local/git-2.45.2-1/desc +++ b/var/lib/pacman/local/git-2.46.0-1/desc @@ -2,7 +2,7 @@ git %VERSION% -2.45.2-1 +2.46.0-1 %BASE% git @@ -17,16 +17,16 @@ https://git-scm.com/ x86_64 %BUILDDATE% -1717282829 +1722318501 %INSTALLDATE% -1717383609 +1722394773 %PACKAGER% -CI (msys2/msys2-autobuild/59bb7f6f/9333671262) +CI (msys2/msys2-autobuild/00495cb2/10156845412) %SIZE% -39218463 +39293687 %GROUPS% VCS diff --git a/var/lib/pacman/local/git-2.45.2-1/files b/var/lib/pacman/local/git-2.46.0-1/files similarity index 99% rename from var/lib/pacman/local/git-2.45.2-1/files rename to var/lib/pacman/local/git-2.46.0-1/files index 3b5caf3840f..f8d78465af2 100644 --- a/var/lib/pacman/local/git-2.45.2-1/files +++ b/var/lib/pacman/local/git-2.46.0-1/files @@ -127,6 +127,7 @@ usr/lib/git-core/git-read-tree.exe usr/lib/git-core/git-rebase.exe usr/lib/git-core/git-receive-pack.exe usr/lib/git-core/git-reflog.exe +usr/lib/git-core/git-refs.exe usr/lib/git-core/git-remote-ext.exe usr/lib/git-core/git-remote-fd.exe usr/lib/git-core/git-remote-ftp.exe @@ -321,6 +322,7 @@ usr/share/git/coccinelle/object_id.cocci usr/share/git/coccinelle/preincr.cocci usr/share/git/coccinelle/qsort.cocci usr/share/git/coccinelle/README +usr/share/git/coccinelle/refs.cocci usr/share/git/coccinelle/spatchcache usr/share/git/coccinelle/strbuf.cocci usr/share/git/coccinelle/swap.cocci @@ -671,6 +673,7 @@ usr/share/man/man1/git-read-tree.1.gz usr/share/man/man1/git-rebase.1.gz usr/share/man/man1/git-receive-pack.1.gz usr/share/man/man1/git-reflog.1.gz +usr/share/man/man1/git-refs.1.gz usr/share/man/man1/git-remote-ext.1.gz usr/share/man/man1/git-remote-fd.1.gz usr/share/man/man1/git-remote.1.gz @@ -757,6 +760,7 @@ usr/share/man/man7/giteveryday.7.gz usr/share/man/man7/gitfaq.7.gz usr/share/man/man7/gitglossary.7.gz usr/share/man/man7/gitnamespaces.7.gz +usr/share/man/man7/gitpacking.7.gz usr/share/man/man7/gitremote-helpers.7.gz usr/share/man/man7/gitrevisions.7.gz usr/share/man/man7/gitsubmodules.7.gz diff --git a/var/lib/pacman/local/git-2.46.0-1/mtree b/var/lib/pacman/local/git-2.46.0-1/mtree new file mode 100644 index 00000000000..7c8c639f151 Binary files /dev/null and b/var/lib/pacman/local/git-2.46.0-1/mtree differ diff --git a/var/lib/pacman/local/mingw-w64-x86_64-git-extra-1.1.641.031e03baf-1/desc b/var/lib/pacman/local/mingw-w64-x86_64-git-extra-1.1.641.031e03baf-1/desc index 8d72427ca6f..7cac46a7706 100644 --- a/var/lib/pacman/local/mingw-w64-x86_64-git-extra-1.1.641.031e03baf-1/desc +++ b/var/lib/pacman/local/mingw-w64-x86_64-git-extra-1.1.641.031e03baf-1/desc @@ -20,7 +20,7 @@ any 1718204260 %INSTALLDATE% -1722308374 +1722394774 %PACKAGER% Johannes Schindelin diff --git a/var/lib/pacman/sync/clang32.db b/var/lib/pacman/sync/clang32.db index 44e503769e9..a286ac17330 100644 Binary files a/var/lib/pacman/sync/clang32.db and b/var/lib/pacman/sync/clang32.db differ diff --git a/var/lib/pacman/sync/clang32.db.sig b/var/lib/pacman/sync/clang32.db.sig index 02d1e8070c2..e1c8781dde2 100644 Binary files a/var/lib/pacman/sync/clang32.db.sig and b/var/lib/pacman/sync/clang32.db.sig differ diff --git a/var/lib/pacman/sync/clang64.db b/var/lib/pacman/sync/clang64.db index c31830f3cee..5351a1f3293 100644 Binary files a/var/lib/pacman/sync/clang64.db and b/var/lib/pacman/sync/clang64.db differ diff --git a/var/lib/pacman/sync/clang64.db.sig b/var/lib/pacman/sync/clang64.db.sig index ad6d33f8675..88f705d36a3 100644 Binary files a/var/lib/pacman/sync/clang64.db.sig and b/var/lib/pacman/sync/clang64.db.sig differ diff --git a/var/lib/pacman/sync/clangarm64.db b/var/lib/pacman/sync/clangarm64.db index 09401b67bef..bc164e83693 100644 Binary files a/var/lib/pacman/sync/clangarm64.db and b/var/lib/pacman/sync/clangarm64.db differ diff --git a/var/lib/pacman/sync/clangarm64.db.sig b/var/lib/pacman/sync/clangarm64.db.sig index 1a2f3f1726a..4bdeabe3fc0 100644 Binary files a/var/lib/pacman/sync/clangarm64.db.sig and b/var/lib/pacman/sync/clangarm64.db.sig differ diff --git a/var/lib/pacman/sync/mingw32.db b/var/lib/pacman/sync/mingw32.db index 4a8fc064e29..9e9dcd8c9d2 100644 Binary files a/var/lib/pacman/sync/mingw32.db and b/var/lib/pacman/sync/mingw32.db differ diff --git a/var/lib/pacman/sync/mingw32.db.sig b/var/lib/pacman/sync/mingw32.db.sig index 8512de95458..e11b35f7b0e 100644 Binary files a/var/lib/pacman/sync/mingw32.db.sig and b/var/lib/pacman/sync/mingw32.db.sig differ diff --git a/var/lib/pacman/sync/mingw64.db b/var/lib/pacman/sync/mingw64.db index 475583764da..36a9949818a 100644 Binary files a/var/lib/pacman/sync/mingw64.db and b/var/lib/pacman/sync/mingw64.db differ diff --git a/var/lib/pacman/sync/mingw64.db.sig b/var/lib/pacman/sync/mingw64.db.sig index 810cc28cdba..63bd2fc2523 100644 Binary files a/var/lib/pacman/sync/mingw64.db.sig and b/var/lib/pacman/sync/mingw64.db.sig differ diff --git a/var/lib/pacman/sync/msys.db b/var/lib/pacman/sync/msys.db index ab160d7bf93..b852396acc0 100644 Binary files a/var/lib/pacman/sync/msys.db and b/var/lib/pacman/sync/msys.db differ diff --git a/var/lib/pacman/sync/msys.db.sig b/var/lib/pacman/sync/msys.db.sig index 712a21df68b..8002f5ca4bd 100644 Binary files a/var/lib/pacman/sync/msys.db.sig and b/var/lib/pacman/sync/msys.db.sig differ diff --git a/var/lib/pacman/sync/ucrt64.db b/var/lib/pacman/sync/ucrt64.db index fb49f0e6567..3232e1df23d 100644 Binary files a/var/lib/pacman/sync/ucrt64.db and b/var/lib/pacman/sync/ucrt64.db differ diff --git a/var/lib/pacman/sync/ucrt64.db.sig b/var/lib/pacman/sync/ucrt64.db.sig index e1a07b6204e..820c7643a43 100644 Binary files a/var/lib/pacman/sync/ucrt64.db.sig and b/var/lib/pacman/sync/ucrt64.db.sig differ